[ARM] 3817/1: iop3xx: split the iop3xx mach into iop32x and iop33x

[deliverable/linux.git] / arch / arm / configs / iq80332_defconfig

diff --git a/arch/arm/configs/iq80332_defconfig b/arch/arm/configs/iq80332_defconfig
index 305f01f3a7299c64666a0d7da9d60ee57bb7361a..931c78755a30b9bc2f9a9ee25d324f7a8d57da24 100644 (file)
--- a/arch/arm/configs/iq80332_defconfig
+++ b/arch/arm/configs/iq80332_defconfig
@@ -64,10 +64,10 @@ CONFIG_KMOD=y
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_INTEGRATOR is not set
-CONFIG_ARCH_IOP3XX=y
+# CONFIG_ARCH_IOP32X is not set
+CONFIG_ARCH_IOP33X=y
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_L7200 is not set
@@ -94,7 +94,6 @@ CONFIG_ARCH_IOP3XX=y
 # CONFIG_ARCH_IQ80331 is not set
 CONFIG_MACH_IQ80332=y
 # CONFIG_ARCH_EP80219 is not set
-CONFIG_ARCH_IOP331=y
 
 #
 # IOP3xx Chipset Features
@@ -497,6 +496,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
 CONFIG_E1000_NAPI=y
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set