aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2011-03-10 16:49:56 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-11 14:26:09 -0800
commite49c459c33189cfc7cff581d3c2e7f0074835118 (patch)
treeee24e6a748cf7fc4a3a1bfe0f07d5a86dae21f4b
parent0074f59b51a2882ce3b8e3922c52f4c547bd56b7 (diff)
downloadkernel_samsung_crespo-e49c459c33189cfc7cff581d3c2e7f0074835118.zip
kernel_samsung_crespo-e49c459c33189cfc7cff581d3c2e7f0074835118.tar.gz
kernel_samsung_crespo-e49c459c33189cfc7cff581d3c2e7f0074835118.tar.bz2
usb-storage: fix menu ordering
Move the USB_STORAGE_ENE_UB6250 entry so that it stays under the USB_STORAGE menu. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/storage/Kconfig30
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index e34f655..3e6e3c1 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -172,6 +172,21 @@ config USB_STORAGE_CYPRESS_ATACB
If this driver is compiled as a module, it will be named ums-cypress.
+config USB_STORAGE_ENE_UB6250
+ tristate "USB ENE card reader support"
+ depends on USB && SCSI
+ depends on USB_STORAGE
+ ---help---
+ Say Y here if you wish to control a ENE SD Card reader.
+ To use SM/MS card, please build driver/staging/keucr/keucr.ko
+
+ This option depends on 'SCSI' support being enabled, but you
+ probably also need 'SCSI device support: SCSI disk support'
+ (BLK_DEV_SD) for most USB storage devices.
+
+ To compile this driver as a module, choose M here: the
+ module will be called ums-eneub6250.
+
config USB_UAS
tristate "USB Attached SCSI"
depends on USB && SCSI
@@ -198,18 +213,3 @@ config USB_LIBUSUAL
options libusual bias="ub"
If unsure, say N.
-
-config USB_STORAGE_ENE_UB6250
- tristate "USB ENE card reader support"
- depends on USB && SCSI
- depends on USB_STORAGE
- ---help---
- Say Y here if you wish to control a ENE SD Card reader.
- To use SM/MS card, please build driver/staging/keucr/keucr.ko
-
- This option depends on 'SCSI' support being enabled, but you
- probably also need 'SCSI device support: SCSI disk support'
- (BLK_DEV_SD) for most USB storage devices.
-
- To compile this driver as a module, choose M here: the
- module will be called ums-eneub6250.