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 939c702..80aecef 100644 (file)
--- a/target/linux/rdc/config-2.6.28
+++ b/target/linux/rdc/config-2.6.28
@@ -48,9 +48,6 @@ CONFIG_CPU_SUP_UMC_32=y
 # 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
@@ -119,12 +116,11 @@ CONFIG_HZ_250=y
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR 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_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