kernel: update to 2.6.31.9 and 2.6.32.2, and refresh patches

[openwrt.git] / target / linux / ixp4xx / config-2.6.32

diff --git a/target/linux/ixp4xx/config-2.6.32 b/target/linux/ixp4xx/config-2.6.32
index 8a600a9..db9d9f8 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.32
+++ b/target/linux/ixp4xx/config-2.6.32
@@ -15,7 +15,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARM_THUMB is not set
 CONFIG_ARM=y
 # CONFIG_ARPD is not set
 # CONFIG_ARM_THUMB is not set
 CONFIG_ARM=y
 # CONFIG_ARPD is not set

-CONFIG_BASE_SMALL=0

 CONFIG_BITREVERSE=y
 CONFIG_BOUNCE=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 CONFIG_BITREVERSE=y
 CONFIG_BOUNCE=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"


@@ -34,7 +33,6 @@ CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y

-# CONFIG_DEBUG_BUGVERBOSE is not set

 # CONFIG_DEBUG_USER is not set
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y


@@ -125,12 +123,8 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_IXP4XX=y
 CONFIG_MTD_OTP=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_IXP4XX=y
 CONFIG_MTD_OTP=y
 CONFIG_MTD_REDBOOT_PARTS=y

-# CONFIG_NATSEMI is not set
-# CONFIG_NVRAM is not set

 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000

-CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y

 CONFIG_PHYLIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_PHYLIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y


@@ -146,7 +140,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

-CONFIG_TICK_ONESHOT=y

 CONFIG_UID16=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_UID16=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VECTORS_BASE=0xffff0000