resync 2.6.31 patches

[openwrt.git] / target / linux / rdc / config-2.6.28

diff --git a/target/linux/rdc/config-2.6.28 b/target/linux/rdc/config-2.6.28
index 206990b..80aecef 100644 (file)
--- a/target/linux/rdc/config-2.6.28
+++ b/target/linux/rdc/config-2.6.28
@@ -30,9 +30,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BOUNCE=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BOUNCE=y

+CONFIG_CC_OPTIMIZE_FOR_SIZE=y

 CONFIG_CLASSIC_RCU=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y

-CONFIG_CMDLINE="console=ttyS0,38400 init=/etc/preinit"
+CONFIG_CMDLINE="console=ttyS0,38400"

 CONFIG_CMDLINE_BOOL=y
 # CONFIG_CMDLINE_OVERRIDE is not set
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
 # CONFIG_CMDLINE_OVERRIDE is not set
 # CONFIG_COMPAT_VDSO is not set


@@ -44,16 +45,9 @@ CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y

-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set

 # CONFIG_CS5535_GPIO is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set

-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="cfq"

 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DELL_RBU is not set
 CONFIG_DEVPORT=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DELL_RBU is not set
 CONFIG_DEVPORT=y


@@ -68,7 +62,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y

-# CONFIG_FREEZER is not set

 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y


@@ -123,15 +116,11 @@ CONFIG_HZ_250=y
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set

-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_ASM is not set

 CONFIG_ICPLUS_PHY=y
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_ICPLUS_PHY=y
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IOMMU_HELPER is not set

-CONFIG_IOSCHED_CFQ=y
-# CONFIG_IOSCHED_DEADLINE is not set

 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set


@@ -150,7 +139,6 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_KERNEL_GZIP is not set
 CONFIG_KERNEL_LZMA=y
 CONFIG_KEXEC=y
 # CONFIG_KERNEL_GZIP is not set
 CONFIG_KERNEL_LZMA=y
 CONFIG_KEXEC=y

-CONFIG_KMOD=y

 CONFIG_KTIME_SCALAR=y
 # CONFIG_KVM is not set
 CONFIG_LBD=y
 CONFIG_KTIME_SCALAR=y
 # CONFIG_KVM is not set
 CONFIG_LBD=y


@@ -188,6 +176,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
 # CONFIG_MTD_NETSC520 is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
 # CONFIG_MTD_NETSC520 is not set

+# CONFIG_MTD_R8610 is not set

 CONFIG_MTD_RDC3210=y
 CONFIG_MTD_RDC3210_ALLOW_JFFS2=y
 CONFIG_MTD_RDC3210_BUSWIDTH=2
 CONFIG_MTD_RDC3210=y
 CONFIG_MTD_RDC3210_ALLOW_JFFS2=y
 CONFIG_MTD_RDC3210_BUSWIDTH=2


@@ -202,7 +191,6 @@ CONFIG_MTD_RDC3210_SIZE=0x400000
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 # CONFIG_NATSEMI is not set

-# CONFIG_NF_DEFRAG_IPV4 is not set

 CONFIG_NOHIGHMEM=y
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 CONFIG_NOHIGHMEM=y
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y


@@ -227,7 +215,6 @@ CONFIG_PCI_GOANY=y
 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000

-# CONFIG_PHYS_ADDR_T_64BIT is not set

 # CONFIG_PROCESSOR_SELECT is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_R6040 is not set
 # CONFIG_PROCESSOR_SELECT is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_R6040 is not set