diff options
Diffstat (limited to 'drivers/block/Kconfig')
-rw-r--r-- | drivers/block/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 7b1cd93892be..139cbba76180 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig | |||
@@ -117,7 +117,7 @@ config BLK_DEV_XD | |||
117 | 117 | ||
118 | config PARIDE | 118 | config PARIDE |
119 | tristate "Parallel port IDE device support" | 119 | tristate "Parallel port IDE device support" |
120 | depends on PARPORT | 120 | depends on PARPORT_PC |
121 | ---help--- | 121 | ---help--- |
122 | There are many external CD-ROM and disk devices that connect through | 122 | There are many external CD-ROM and disk devices that connect through |
123 | your computer's parallel port. Most of them are actually IDE devices | 123 | your computer's parallel port. Most of them are actually IDE devices |
@@ -358,7 +358,8 @@ config BLK_DEV_UB | |||
358 | This driver supports certain USB attached storage devices | 358 | This driver supports certain USB attached storage devices |
359 | such as flash keys. | 359 | such as flash keys. |
360 | 360 | ||
361 | Warning: Enabling this cripples the usb-storage driver. | 361 | If you enable this driver, it is recommended to avoid conflicts |
362 | with usb-storage by enabling USB_LIBUSUAL. | ||
362 | 363 | ||
363 | If unsure, say N. | 364 | If unsure, say N. |
364 | 365 | ||