[kernel] refresh 2.6.33 patches

[openwrt.git] / target / linux / generic-2.6 / config-2.6.30

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 0ae8293..c73d8d8 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -869,7 +869,7 @@ CONFIG_INPUT_MISC=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
 # CONFIG_IP1000 is not set
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
 # CONFIG_IP1000 is not set

-# CONFIG_IP175C_PHY is not set
+# CONFIG_IP17XX_PHY is not set

 # CONFIG_IP6_NF_FILTER is not set
 # CONFIG_IP6_NF_IPTABLES is not set
 # CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP6_NF_FILTER is not set
 # CONFIG_IP6_NF_IPTABLES is not set
 # CONFIG_IP6_NF_MANGLE is not set


@@ -1525,10 +1525,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OCF_BENCH is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OCF_BENCH is not set

+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set

 # CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_HIFN is not set
 # CONFIG_OCF_IXP4XX is not set
 # CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_HIFN is not set
 # CONFIG_OCF_IXP4XX is not set

+# CONFIG_OCF_KIRKWOOD is not set

 # CONFIG_OCF_OCF is not set
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OCF_OCF is not set
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCFS2_FS is not set


@@ -2164,7 +2167,6 @@ CONFIG_SQUASHFS_LZMA=y
 CONFIG_SQUASHFS_SUPPORT_ZLIB=y
 # CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_SUPPORT_ZLIB=y
 # CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_SQUASHFS=y

-# CONFIG_SSB_BLOCKIO is not set

 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set


@@ -2486,21 +2488,11 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_SN9C102 is not set
 # CONFIG_USB_SPEEDTOUCH is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_SN9C102 is not set
 # CONFIG_USB_SPEEDTOUCH is not set
 # CONFIG_USB_STKWEBCAM is not set

-CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-CONFIG_USB_STORAGE_DATAFAB=y

 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_DPCM=y
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_DPCM=y

-CONFIG_USB_STORAGE_FREECOM=y
-# CONFIG_USB_STORAGE_ISD200 is not set

 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE is not set

-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y

 # CONFIG_USB_STORAGE_ONETOUCH is not set
 # CONFIG_USB_STORAGE_ONETOUCH is not set

-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y

 # CONFIG_USB_STORAGE_SIERRA is not set
 # CONFIG_USB_STORAGE_SIERRA is not set

-CONFIG_USB_STORAGE_USBAT=y

 # CONFIG_USB_STV06XX is not set
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_USB_STV06XX is not set
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_SUPPORT is not set