From cc6c037ddbe2c65666d6f7fa2bb25ba6c45e1c18 Mon Sep 17 00:00:00 2001 From: Tomasz Duszynski Date: Mon, 16 Oct 2017 11:07:48 +0200 Subject: [PATCH] net: mvpp2x: change driver name to avoid registration error In case both mvpp2 and mvpp2x are compiled into the kernel during boot one will get following error from driver_register(): Error: Driver 'mvpp2' is already registered, aborting.. That happens because both drivers have name set to 'mvpp2'. This patch fixes that by changing mvpp2x driver's name to 'mvpp2x'. Signed-off-by: Tomasz Duszynski --- drivers/net/ethernet/marvell/mvpp2x/mv_pp2x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x.h b/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x.h index fb3ca3b912b08..803813aa6b55f 100644 --- a/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x.h +++ b/drivers/net/ethernet/marvell/mvpp2x/mv_pp2x.h @@ -26,7 +26,7 @@ #include "mv_pp2x_hw_type.h" #include "mv_gop110_hw_type.h" -#define MVPP2_DRIVER_NAME "mvpp2" +#define MVPP2_DRIVER_NAME "mvpp2x" #define MVPP2_DRIVER_VERSION "1.0" #define MVPP2X_SKB_MAGIC_MASK 0xFFFFFFC0