aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/config-2.6.31
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2011-11-25 20:47:44 +0000
committerNicolas Thill <nico@openwrt.org>2011-11-25 20:47:44 +0000
commit5e83009a5218ad957d19cb4ca61ee678aae9f7c9 (patch)
tree72759c5cacf82616761031032a1fcf416d53be9e /target/linux/generic/config-2.6.31
parent59a4ad8820e8ef395d4c9568d6b62931b5c224e3 (diff)
downloadupstream-5e83009a5218ad957d19cb4ca61ee678aae9f7c9.tar.gz
upstream-5e83009a5218ad957d19cb4ca61ee678aae9f7c9.tar.bz2
upstream-5e83009a5218ad957d19cb4ca61ee678aae9f7c9.zip
targets: fix CONFIG_USB_STORAGE_* inconsistency
* all options were switched from bool to tristate in 2.6.30 * add/change/move them to generic, disabled by default * remove extinct CONFIG_USB_STORAGE_DPCM dropped in 2.6.29, merged with CONFIG_USB_STORAGE_SDDR09 * remove extinct CONFIG_USB_STORAGE_SIERRA option in 2.6 * cleanup ordering SVN-Revision: 29337
Diffstat (limited to 'target/linux/generic/config-2.6.31')
-rw-r--r--target/linux/generic/config-2.6.3112
1 files changed, 10 insertions, 2 deletions
diff --git a/target/linux/generic/config-2.6.31 b/target/linux/generic/config-2.6.31
index c79c657c84..745a33ee47 100644
--- a/target/linux/generic/config-2.6.31
+++ b/target/linux/generic/config-2.6.31
@@ -2537,10 +2537,18 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y
# CONFIG_USB_SPEEDTOUCH is not set
# CONFIG_USB_STKWEBCAM is not set
# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_SIERRA is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
# CONFIG_USB_STV06XX is not set
# CONFIG_USB_STV680 is not set
# CONFIG_USB_SUPPORT is not set