[ar71xx] sync kernel config

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

diff --git a/target/linux/ps3/config-2.6.28 b/target/linux/ps3/config-2.6.28
index 38be14b..e5ad3fe 100644 (file)
--- a/target/linux/ps3/config-2.6.28
+++ b/target/linux/ps3/config-2.6.28
@@ -57,7 +57,6 @@ CONFIG_CRYPTO_RNG2=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEBUG_FS is not set
 CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set

-CONFIG_DEFAULT_IOSCHED="anticipatory"

 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEVKMEM=y
 CONFIG_DNOTIFY=y
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEVKMEM=y
 CONFIG_DNOTIFY=y


@@ -175,8 +174,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_IOMMU_HELPER=y
 # CONFIG_IOMMU_VMERGE is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_IOMMU_HELPER=y
 # CONFIG_IOMMU_VMERGE is not set

-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_CFQ=y

 # CONFIG_IPIC is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IPIC is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_MULTICAST is not set


@@ -211,7 +208,6 @@ CONFIG_JBD2=y
 # CONFIG_JOYSTICK_ZHENHUA is not set
 CONFIG_KERNEL_START=0xc000000000000000
 CONFIG_KEXEC=y
 # CONFIG_JOYSTICK_ZHENHUA is not set
 CONFIG_KERNEL_START=0xc000000000000000
 CONFIG_KEXEC=y

-CONFIG_LOCALVERSION_AUTO=y

 CONFIG_LOCKD=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_LOGO=y
 CONFIG_LOCKD=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_LOGO=y


@@ -233,8 +229,6 @@ CONFIG_MSDOS_FS=y
 # CONFIG_MTD is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_NET_ETHERNET is not set
 # CONFIG_MTD is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_NET_ETHERNET is not set

-# CONFIG_NET_SCHED is not set
-# CONFIG_NEW_LEDS is not set

 CONFIG_NFS_FS=y
 CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NFS_FS=y
 CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_437=y