Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236371
b: refs/heads/master
c: e49c459
h: refs/heads/master
i:
  236369: 3cf340c
  236367: 982c012
v: v3
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Mar 11, 2011
1 parent 925ec48 commit 3511e9f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0074f59b51a2882ce3b8e3922c52f4c547bd56b7
refs/heads/master: e49c459c33189cfc7cff581d3c2e7f0074835118
30 changes: 15 additions & 15 deletions trunk/drivers/usb/storage/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.

0 comments on commit 3511e9f

Please sign in to comment.