Browse Source

Staging: Merge ENE UB6250 MS card codes from keucr to drivers/usb/storage/ene_ub6250.c

Merge ENE UB6250 MS card codes from keucr to drivers/usb/storage/ene_ub6250.c.

Signed-off-by: Cho, Yu-Chen <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cho, Yu-Chen 14 years ago
parent
commit
33842cedfc
2 changed files with 1812 additions and 189 deletions
  1. 2 2
      drivers/usb/storage/Kconfig
  2. 1810 187
      drivers/usb/storage/ene_ub6250.c

+ 2 - 2
drivers/usb/storage/Kconfig

@@ -187,8 +187,8 @@ config USB_STORAGE_ENE_UB6250
 	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
+	  Say Y here if you wish to control a ENE SD/MS Card reader.
+	  To use SM 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'

File diff suppressed because it is too large
+ 1810 - 187
drivers/usb/storage/ene_ub6250.c


Some files were not shown because too many files changed in this diff