* Remove CONFIG_BLK_DEV_HD hack from init_hwif_default() ("ide0=noprobe"
  kernel parameter should be used instead if somebody wishes to use the
  old "hd" driver).

* Make CONFIG_BLK_DEV_HD_ONLY config option available also when IDE
  subsystem is used and update help entry.

* Remove no longer needed CONFIG_BLK_DEV_HD_IDE config option.

Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
 drivers/ide/Kconfig |   25 +++++--------------------
 drivers/ide/ide.c   |    4 ----
 2 files changed, 5 insertions(+), 24 deletions(-)

Index: b/drivers/ide/Kconfig
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -118,24 +118,6 @@ config BLK_DEV_IDE_SATA
          If unsure, say N.
-config BLK_DEV_HD_IDE
-       bool "Use old disk-only driver on primary interface"
-       depends on (X86 || SH_MPC1211)
-       ---help---
-         There are two drivers for MFM/RLL/IDE disks.  Most people use just
-         the new enhanced driver by itself.  This option however installs the
-         old hard disk driver to control the primary IDE/disk interface in
-         the system, leaving the new enhanced IDE driver to take care of only
-         the 2nd/3rd/4th IDE interfaces.  Doing this will prevent you from
-         having an IDE/ATAPI CD-ROM or tape drive connected to the primary
-         IDE interface.  Choosing this option may be useful for older systems
-         which have MFM/RLL/ESDI controller+drives at the primary port
-         address (0x1f0), along with IDE drives at the secondary/3rd/4th port
-         addresses.
-         Normally, just say N here; you will then use the new driver for all
-         4 interfaces.
        tristate "Include IDE/ATA-2 DISK support"
@@ -1112,7 +1094,6 @@ endif
        bool "Old hard disk (MFM/RLL/IDE) driver"
-       depends on BLK_DEV_IDE=n
          There are two drivers for MFM/RLL/IDE hard disks. Most people use
          the newer enhanced driver, but this old one is still around for two
@@ -1124,12 +1105,16 @@ config BLK_DEV_HD_ONLY
          for systems with only older MFM/RLL/ESDI drives. Choosing the old
          driver can save 13 KB or so of kernel memory.
+         If you want to use this driver together with the new one you have
+         to use "ide0=noprobe" kernel parameter to prevent the new driver
+         from probing the primary interface.
          If you are unsure, then just choose the Enhanced IDE/MFM/RLL driver
          instead of this one. For more detailed information, read the
          Disk-HOWTO, available from
 config BLK_DEV_HD
-       def_bool BLK_DEV_HD_IDE || BLK_DEV_HD_ONLY
+       def_bool BLK_DEV_HD_ONLY
 endif # IDE
Index: b/drivers/ide/ide.c
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -179,10 +179,6 @@ static void init_hwif_default(ide_hwif_t
        memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports));
        hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
-       if (hwif->io_ports[IDE_DATA_OFFSET] == HD_DATA)
-               hwif->noprobe = 1;      /* may be overridden by ide_setup() */
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to