From db983883705ba057f36d36951234a735ef1b78b2 Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 25 Nov 2011 20:47:44 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29337 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/config-2.6.30 | 12 ++++++++++-- target/linux/generic/config-2.6.31 | 12 ++++++++++-- target/linux/generic/config-2.6.32 | 12 ++++++++++-- target/linux/generic/config-2.6.36 | 16 ++++++++-------- target/linux/generic/config-2.6.37 | 16 ++++++++-------- target/linux/generic/config-2.6.38 | 16 ++++++++-------- target/linux/generic/config-2.6.39 | 20 ++++++++++---------- target/linux/generic/config-3.0 | 20 ++++++++++---------- target/linux/generic/config-3.1 | 20 ++++++++++---------- 9 files changed, 84 insertions(+), 60 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/config-2.6.30 b/target/linux/generic/config-2.6.30 index 031512c0b..58fee159f 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 c79c657c8..745a33ee4 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 37a271431..736a965c1 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 1950559c1..4200c441e 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 0d5ed5357..c86bc9fcf 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 f6002c24b..2f10cd547 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 2d3d9ba0b..fd6c5cdb0 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 dd4d15394..bc31d9486 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 28b12235b..2a0440c8b 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 -- cgit v1.2.3