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>
This commit is contained in:
Cho, Yu-Chen 2011-07-07 11:27:13 +08:00 committed by Greg Kroah-Hartman
parent 01e57c5742
commit 33842cedfc
2 changed files with 1632 additions and 11 deletions

View File

@ -187,8 +187,8 @@ config USB_STORAGE_ENE_UB6250
depends on USB && SCSI depends on USB && SCSI
depends on USB_STORAGE depends on USB_STORAGE
---help--- ---help---
Say Y here if you wish to control a ENE SD Card reader. Say Y here if you wish to control a ENE SD/MS Card reader.
To use SM/MS card, please build driver/staging/keucr/keucr.ko To use SM card, please build driver/staging/keucr/keucr.ko
This option depends on 'SCSI' support being enabled, but you This option depends on 'SCSI' support being enabled, but you
probably also need 'SCSI device support: SCSI disk support' probably also need 'SCSI device support: SCSI disk support'

File diff suppressed because it is too large Load Diff