From: Simon Horman Date: Thu, 10 Oct 2013 06:12:17 +0000 (+0900) Subject: ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f3a3d2cfb7fb10e2e23d02abb5459ff974f2c8bd;p=deliverable%2Flinux.git ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig CONFIG_SMC911X is not needed by marzen. It appears to have been accidently enabled as well as CONFIG_SMSC911X which is needed by marzen. Signed-off-by: Simon Horman --- diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index a423badba241..9ce38f6931e5 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -59,7 +59,6 @@ CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_SEEQ is not set -CONFIG_SMC911X=y CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_WLAN is not set