Linus, please pull from:
to receive the following updates:
drivers/ide/Kconfig | 16 +---------------
drivers/ide/arm/palm_bk3710.c | 8 +++-----
drivers/ide/ide-disk.c | 14 --------------
include/linux/ide.h | 5 ++---
4 files changed, 6 insertions(+), 37 deletions(-)
Bartlomiej Zolnierkiewicz (3):
ide: fix hwif_to_node()
ide-disk: remove stale init_idedisk_capacity() documentation
ide/Kconfig: mark ide-scsi as deprecated
David Brownell (1):
palm_bk3710: improve IDE registration
Kevin Hilman (2):
IDE: compile fix for sff_dma_ops
IDE: palm_bk3710: fix compile warning for unused variable
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index a34758d..fc735ab 100644
@@ -242,7 +242,7 @@ config BLK_DEV_IDEFLOPPY
module will be called ide-floppy.
- tristate "SCSI emulation support"
+ tristate "SCSI emulation support (DEPRECATED)"
depends on SCSI
@@ -255,20 +255,6 @@ config BLK_DEV_IDESCSI
and will allow you to use a SCSI device driver instead of a native
- This is useful if you have an ATAPI device for which no native
- driver has been written (for example, an ATAPI PD-CD drive);
- you can then use this emulation together with an appropriate SCSI
- device driver. In order to do this, say Y here and to "SCSI support"
- and "SCSI generic support", below. You must then provide the kernel
- command line "hdx=ide-scsi" (try "man bootparam" or see the
- documentation of your boot loader (lilo or loadlin) about how to
- pass options to the kernel at boot time) for devices if you want the
- native EIDE sub-drivers to skip over the native support, so that
- this SCSI emulation can be used instead.
- Note that this option does NOT allow you to attach SCSI ...