aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
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
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')
-rw-r--r--target/linux/generic/config-2.6.3012
-rw-r--r--target/linux/generic/config-2.6.3112
-rw-r--r--target/linux/generic/config-2.6.3212
-rw-r--r--target/linux/generic/config-2.6.3616
-rw-r--r--target/linux/generic/config-2.6.3716
-rw-r--r--target/linux/generic/config-2.6.3816
-rw-r--r--target/linux/generic/config-2.6.3920
-rw-r--r--target/linux/generic/config-3.020
-rw-r--r--target/linux/generic/config-3.120
9 files changed, 84 insertions, 60 deletions
diff --git a/target/linux/generic/config-2.6.30 b/target/linux/generic/config-2.6.30
index 031512c0b3..58fee159f9 100644
--- a/target/linux/generic/config-2.6.30
+++ b/target/linux/generic/config-2.6.30
@@ -2519,10 +2519,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
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
diff --git a/target/linux/generic/config-2.6.32 b/target/linux/generic/config-2.6.32
index 37a2714310..736a965c10 100644
--- a/target/linux/generic/config-2.6.32
+++ b/target/linux/generic/config-2.6.32
@@ -2658,10 +2658,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
diff --git a/target/linux/generic/config-2.6.36 b/target/linux/generic/config-2.6.36
index 1950559c11..4200c441e7 100644
--- a/target/linux/generic/config-2.6.36
+++ b/target/linux/generic/config-2.6.36
@@ -2736,18 +2736,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=y
+# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-CONFIG_USB_STORAGE_DATAFAB=y
+# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_FREECOM=y
+# CONFIG_USB_STORAGE_FREECOM is not set
# CONFIG_USB_STORAGE_ISD200 is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_USBAT=y
+# 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_SUPPORT is not set
# CONFIG_USB_SUSPEND is not set
diff --git a/target/linux/generic/config-2.6.37 b/target/linux/generic/config-2.6.37
index 0d5ed53576..c86bc9fcf4 100644
--- a/target/linux/generic/config-2.6.37
+++ b/target/linux/generic/config-2.6.37
@@ -2797,18 +2797,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=y
+# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-CONFIG_USB_STORAGE_DATAFAB=y
+# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_FREECOM=y
+# CONFIG_USB_STORAGE_FREECOM is not set
# CONFIG_USB_STORAGE_ISD200 is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_USBAT=y
+# 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_SUPPORT is not set
# CONFIG_USB_SUSPEND is not set
diff --git a/target/linux/generic/config-2.6.38 b/target/linux/generic/config-2.6.38
index f6002c24b4..2f10cd5476 100644
--- a/target/linux/generic/config-2.6.38
+++ b/target/linux/generic/config-2.6.38
@@ -2850,18 +2850,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=y
+# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-CONFIG_USB_STORAGE_DATAFAB=y
+# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_FREECOM=y
+# CONFIG_USB_STORAGE_FREECOM is not set
# CONFIG_USB_STORAGE_ISD200 is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_USBAT=y
+# 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_SUPPORT is not set
# CONFIG_USB_SUSPEND is not set
diff --git a/target/linux/generic/config-2.6.39 b/target/linux/generic/config-2.6.39
index 2d3d9ba0b4..fd6c5cdb06 100644
--- a/target/linux/generic/config-2.6.39
+++ b/target/linux/generic/config-2.6.39
@@ -2912,20 +2912,20 @@ 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=y
+# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_STORAGE_DATAFAB=y
+# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-CONFIG_USB_STORAGE_FREECOM=y
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
# CONFIG_USB_STORAGE_ISD200 is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_USBAT=y
+# CONFIG_USB_STORAGE_REALTEK 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_SUPPORT is not set
# CONFIG_USB_SUSPEND is not set
diff --git a/target/linux/generic/config-3.0 b/target/linux/generic/config-3.0
index dd4d153940..bc31d94866 100644
--- a/target/linux/generic/config-3.0
+++ b/target/linux/generic/config-3.0
@@ -2894,20 +2894,20 @@ 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=y
+# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_STORAGE_DATAFAB=y
+# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-CONFIG_USB_STORAGE_FREECOM=y
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
# CONFIG_USB_STORAGE_ISD200 is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_USBAT=y
+# CONFIG_USB_STORAGE_REALTEK 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_SUPPORT is not set
# CONFIG_USB_SUSPEND is not set
diff --git a/target/linux/generic/config-3.1 b/target/linux/generic/config-3.1
index 28b12235bc..2a0440c8b1 100644
--- a/target/linux/generic/config-3.1
+++ b/target/linux/generic/config-3.1
@@ -2916,20 +2916,20 @@ 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=y
+# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_STORAGE_DATAFAB=y
+# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-CONFIG_USB_STORAGE_FREECOM=y
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
# CONFIG_USB_STORAGE_ISD200 is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_USBAT=y
+# CONFIG_USB_STORAGE_REALTEK 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_SUPPORT is not set
# CONFIG_USB_SUSPEND is not set
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 06:58:04 +0000