From: Alexandros C. Couloumbis <alex@ozo.com>
Date: Sat, 17 Jul 2010 15:45:13 +0000 (+0000)
Subject: ixp4xx: update 2.6.35 config options
X-Git-Tag: v19.07.0-rc1~30027
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2e0ff6cb7c1a6396f59c2447d48c31191c6ddbb4;p=openwrt%2Fstaging%2Fhauke.git

ixp4xx: update 2.6.35 config options

SVN-Revision: 22254
---

diff --git a/target/linux/ixp4xx/config-2.6.35 b/target/linux/ixp4xx/config-2.6.35
index fa66506756..a8e8462913 100644
--- a/target/linux/ixp4xx/config-2.6.35
+++ b/target/linux/ixp4xx/config-2.6.35
@@ -26,7 +26,6 @@ CONFIG_ARM_L1_CACHE_SHIFT=5
 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARPD is not set
 CONFIG_ATA=y
-CONFIG_ATA_BMDMA=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BOUNCE=y
@@ -34,6 +33,7 @@ CONFIG_BOUNCE=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 # CONFIG_CMDLINE_FORCE is not set
+CONFIG_COMPAT_BRK=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_BIG_ENDIAN=y
@@ -60,7 +60,6 @@ CONFIG_EEPROM_AT24=y
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y
-CONFIG_GARP=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -115,8 +114,6 @@ CONFIG_IXP4XX_LEGACY_DMABOUNCE=y
 CONFIG_IXP4XX_NPE=y
 CONFIG_IXP4XX_QMGR=y
 CONFIG_IXP4XX_WATCHDOG=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_LZMA is not set
 CONFIG_LEDS_FSG=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_LATCH=y
@@ -152,16 +149,8 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_IXP4XX=y
 CONFIG_MTD_OTP=y
 CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MVSWITCH_PHY=y
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NET_DSA=y
-CONFIG_NET_DSA_MV88E6060=y
-# CONFIG_NET_DSA_MV88E6123_61_65 is not set
-# CONFIG_NET_DSA_MV88E6131 is not set
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
-# CONFIG_NET_DSA_TAG_DSA is not set
-# CONFIG_NET_DSA_TAG_EDSA is not set
-CONFIG_NET_DSA_TAG_TRAILER=y
 CONFIG_NO_HZ=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
@@ -176,28 +165,21 @@ CONFIG_RTC_DRV_DS1672=y
 CONFIG_RTC_DRV_ISL1208=y
 CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_X1205=y
-# CONFIG_SATA_AHCI_PLATFORM is not set
 CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_SCSI_MOD=y
 CONFIG_SENSORS_AD7418=y
-# CONFIG_SENSORS_EMC1403 is not set
 CONFIG_SENSORS_MAX6650=y
-# CONFIG_SENSORS_TMP102 is not set
 CONFIG_SENSORS_W83781D=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 # CONFIG_SWAP is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_UID16=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_XSCALE_PMU=y
 CONFIG_ZBOOT_ROM_BSS=0x0