diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-11 15:15:41 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-11 15:15:41 -0400 |
| commit | 5b4d4771e2a56671c7f1c94edda427a1e3d6f111 (patch) | |
| tree | 58718288a28cca121a94b681a7865473a10dfd64 /drivers/memstick/Kconfig | |
| parent | 55f78e1771f0886162edd441dd4f39c287779de2 (diff) | |
| parent | baadac8b10c5ac15ce3d26b68fa266c8889b163f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/memstick/Kconfig')
| -rw-r--r-- | drivers/memstick/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memstick/Kconfig b/drivers/memstick/Kconfig index 1093fdb07297..f0ca41c20323 100644 --- a/drivers/memstick/Kconfig +++ b/drivers/memstick/Kconfig | |||
| @@ -8,7 +8,7 @@ menuconfig MEMSTICK | |||
| 8 | Sony MemoryStick is a proprietary storage/extension card protocol. | 8 | Sony MemoryStick is a proprietary storage/extension card protocol. |
| 9 | 9 | ||
| 10 | If you want MemoryStick support, you should say Y here and also | 10 | If you want MemoryStick support, you should say Y here and also |
| 11 | to the specific driver for your MMC interface. | 11 | to the specific driver for your MemoryStick interface. |
| 12 | 12 | ||
| 13 | if MEMSTICK | 13 | if MEMSTICK |
| 14 | 14 | ||