| From e659527897a782e60ae3f1f1b663e87aab2079db Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Thu, 10 Oct 2013 15:12:17 +0900 |
| Subject: 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> |
| (cherry picked from commit f3a3d2cfb7fb10e2e23d02abb5459ff974f2c8bd) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/configs/marzen_defconfig | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| 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 |
| -- |
| 1.8.5.rc3 |
| |
