From 41e568d14ec0aca1b2bb19563517aad3b06d6805 Mon Sep 17 00:00:00 2001 From: huajun li Date: Fri, 4 Mar 2011 10:56:18 +0800 Subject: Staging: Merge ENE UB6250 SD card codes from keucr to drivers/usb/storage The usb portion of this driver can now go into drivers/usb/storage. This leaves the non-usb portion of the code still in staging. Signed-off-by: Huajun Li Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/Kconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'drivers/usb/storage/Kconfig') diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig index 49a489e0371..72448bac2ee 100644 --- a/drivers/usb/storage/Kconfig +++ b/drivers/usb/storage/Kconfig @@ -198,3 +198,17 @@ 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 + ---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. -- cgit v1.2.3-70-g09d2 From 0074f59b51a2882ce3b8e3922c52f4c547bd56b7 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 10 Mar 2011 16:48:36 -0800 Subject: usb-storage: ene_ub6250 depends on USB_STORAGE Fix ene_ub6250 build: it uses usb_storage driver interfaces, so it should depend on USB_STORAGE. ene_ub6250.c:(.text+0x14ff19): undefined reference to `usb_stor_reset_resume' ene_ub6250.c:(.text+0x14ffb1): undefined reference to `usb_stor_bulk_transfer_buf' ene_ub6250.c:(.text+0x14ffdd): undefined reference to `usb_stor_bulk_srb' ene_ub6250.c:(.text+0x14fff1): undefined reference to `usb_stor_bulk_transfer_sg' ene_ub6250.c:(.text+0x1503dd): undefined reference to `usb_stor_set_xfer_buf' ene_ub6250.c:(.text+0x15048e): undefined reference to `usb_stor_access_xfer_buf' ene_ub6250.c:(.text+0x150723): undefined reference to `usb_stor_probe1' ene_ub6250.c:(.text+0x150795): undefined reference to `usb_stor_probe2' ene_ub6250.c:(.text+0x1507af): undefined reference to `usb_stor_disconnect' drivers/built-in.o:(.data+0x10224): undefined reference to `usb_stor_suspend' drivers/built-in.o:(.data+0x10230): undefined reference to `usb_stor_pre_reset' drivers/built-in.o:(.data+0x10234): undefined reference to `usb_stor_post_reset' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/usb/storage/Kconfig') diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig index 72448bac2ee..e34f655af02 100644 --- a/drivers/usb/storage/Kconfig +++ b/drivers/usb/storage/Kconfig @@ -202,6 +202,7 @@ config USB_LIBUSUAL 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 -- cgit v1.2.3-70-g09d2 From e49c459c33189cfc7cff581d3c2e7f0074835118 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 10 Mar 2011 16:49:56 -0800 Subject: 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 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/Kconfig | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'drivers/usb/storage/Kconfig') diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig index e34f655af02..3e6e3c11843 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. -- cgit v1.2.3-70-g09d2