From bbecf24ea56a7f2ebfab2ad74f712156a93a3d3a Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 3 Dec 2011 01:55:55 +0000 Subject: [PATCH] [backfire] backport r29337 (targets: fix CONFIG_USB_STORAGE_* inconsistency) git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@29398 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic-2.6/config-2.6.30 | 20 +++++++++----------- target/linux/generic-2.6/config-2.6.32 | 20 +++++++++----------- target/linux/orion/config-2.6.32 | 10 ---------- 3 files changed, 18 insertions(+), 32 deletions(-) diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30 index c82b81423..a8ec58820 100644 --- a/target/linux/generic-2.6/config-2.6.30 +++ b/target/linux/generic-2.6/config-2.6.30 @@ -2490,21 +2490,19 @@ 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_STORAGE_ALAUDA=y +# 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=y +# CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DPCM=y -CONFIG_USB_STORAGE_FREECOM=y +# CONFIG_USB_STORAGE_FREECOM is not set # CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE 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_SIERRA is not set -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_STV680 is not set # CONFIG_USB_SUPPORT is not set diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32 index 05d3a6bf7..1faed2cc8 100644 --- a/target/linux/generic-2.6/config-2.6.32 +++ b/target/linux/generic-2.6/config-2.6.32 @@ -2625,21 +2625,19 @@ 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_STORAGE_ALAUDA=y +# 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=y +# CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DPCM=y -CONFIG_USB_STORAGE_FREECOM=y +# CONFIG_USB_STORAGE_FREECOM is not set # CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE 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_SIERRA is not set -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_STV680 is not set # CONFIG_USB_SUPPORT is not set diff --git a/target/linux/orion/config-2.6.32 b/target/linux/orion/config-2.6.32 index 58a44edb0..939df5b1d 100644 --- a/target/linux/orion/config-2.6.32 +++ b/target/linux/orion/config-2.6.32 @@ -219,16 +219,6 @@ CONFIG_USB_OHCI_HCD=m # CONFIG_USB_PRINTER is not set # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_SERIAL 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_DPCM is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_KARMA 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_SUPPORT=y CONFIG_USB_UHCI_HCD=m # CONFIG_USB_USBNET is not set -- 2.35.1