summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2013-10-10 08:12:17 +0200
committerSimon Horman <horms+renesas@verge.net.au>2013-11-24 07:13:42 +0100
commitf3a3d2cfb7fb10e2e23d02abb5459ff974f2c8bd (patch)
tree1b71383dc126847594ad57b582f8834f82518a06 /arch/arm/configs
parentARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig (diff)
downloadlinux-f3a3d2cfb7fb10e2e23d02abb5459ff974f2c8bd.tar.xz
linux-f3a3d2cfb7fb10e2e23d02abb5459ff974f2c8bd.zip
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 <horms@verge.net.au>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/marzen_defconfig1
1 files changed, 0 insertions, 1 deletions
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