ide: register ports with non-present devices (for warm-plug)

[linux-2.6] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index df752e690e4739f595dee6dde3c103db522da5fa..3f9e10001e19179706f219a9603f27261c80eb99 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -50,7 +50,7 @@ menuconfig IDE
          To compile this driver as a module, choose M here: the
          module will be called ide.
 
          To compile this driver as a module, choose M here: the
          module will be called ide.
 

-         For further information, please read <file:Documentation/ide.txt>.
+         For further information, please read <file:Documentation/ide/ide.txt>.

 
          If unsure, say Y.
 
 
          If unsure, say Y.
 


@@ -77,7 +77,7 @@ config BLK_DEV_IDE
          Useful information about large (>540 MB) IDE disks, multiple
          interfaces, what to do if ATA/IDE devices are not automatically
          detected, sound card ATA/IDE ports, module support, and other
          Useful information about large (>540 MB) IDE disks, multiple
          interfaces, what to do if ATA/IDE devices are not automatically
          detected, sound card ATA/IDE ports, module support, and other

-         topics, is contained in <file:Documentation/ide.txt>. For detailed
+         topics, is contained in <file:Documentation/ide/ide.txt>. For detailed

          information about hard drives, consult the Disk-HOWTO and the
          Multi-Disk-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
          information about hard drives, consult the Disk-HOWTO and the
          Multi-Disk-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.


@@ -87,7 +87,7 @@ config BLK_DEV_IDE
          <ftp://ibiblio.org/pub/Linux/system/hardware/>.
 
          To compile this driver as a module, choose M here and read
          <ftp://ibiblio.org/pub/Linux/system/hardware/>.
 
          To compile this driver as a module, choose M here and read

-         <file:Documentation/ide.txt>. The module will be called ide-mod.
+         <file:Documentation/ide/ide.txt>. The module will be called ide-mod.

          Do not compile this driver as a module if your root file system (the
          one containing the directory /) is located on an IDE device.
 
          Do not compile this driver as a module if your root file system (the
          one containing the directory /) is located on an IDE device.
 


@@ -98,7 +98,7 @@ config BLK_DEV_IDE
 
 if BLK_DEV_IDE
 
 
 if BLK_DEV_IDE
 

-comment "Please see Documentation/ide.txt for help/info on IDE drives"
+comment "Please see Documentation/ide/ide.txt for help/info on IDE drives"

 
 config BLK_DEV_IDE_SATA
        bool "Support for SATA (deprecated; conflicts with libata SATA driver)"
 
 config BLK_DEV_IDE_SATA
        bool "Support for SATA (deprecated; conflicts with libata SATA driver)"


@@ -122,24 +122,6 @@ config BLK_DEV_IDE_SATA
 
          If unsure, say N.
 
 
          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.
-

 config BLK_DEV_IDEDISK
        tristate "Include IDE/ATA-2 DISK support"
        ---help---
 config BLK_DEV_IDEDISK
        tristate "Include IDE/ATA-2 DISK support"
        ---help---


@@ -235,8 +217,8 @@ config BLK_DEV_IDETAPE
          along with other IDE devices, as "hdb" or "hdc", or something
          similar, and will be mapped to a character device such as "ht0"
          (check the boot messages with dmesg).  Be sure to consult the
          along with other IDE devices, as "hdb" or "hdc", or something
          similar, and will be mapped to a character device such as "ht0"
          (check the boot messages with dmesg).  Be sure to consult the

-         <file:drivers/ide/ide-tape.c> and <file:Documentation/ide.txt> files
-         for usage information.
+         <file:drivers/ide/ide-tape.c> and <file:Documentation/ide/ide.txt>
+         files for usage information.

 
          To compile this driver as a module, choose M here: the
          module will be called ide-tape.
 
          To compile this driver as a module, choose M here: the
          module will be called ide-tape.


@@ -325,6 +307,7 @@ comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
        tristate "generic/default IDE chipset support"
 
 config IDE_GENERIC
        tristate "generic/default IDE chipset support"

+       depends on ALPHA || X86 || IA64 || M32R || MIPS || PPC32

        help
          If unsure, say N.
 
        help
          If unsure, say N.
 


@@ -358,7 +341,7 @@ config BLK_DEV_CMD640
 
          The CMD640 chip is also used on add-in cards by Acculogic, and on
          the "CSA-6400E PCI to IDE controller" that some people have. For
 
          The CMD640 chip is also used on add-in cards by Acculogic, and on
          the "CSA-6400E PCI to IDE controller" that some people have. For

-         details, read <file:Documentation/ide.txt>.
+         details, read <file:Documentation/ide/ide.txt>.

 
 config BLK_DEV_CMD640_ENHANCED
        bool "CMD640 enhanced support"
 
 config BLK_DEV_CMD640_ENHANCED
        bool "CMD640 enhanced support"


@@ -366,7 +349,7 @@ config BLK_DEV_CMD640_ENHANCED
        help
          This option includes support for setting/autotuning PIO modes and
          prefetch on CMD640 IDE interfaces.  For details, read
        help
          This option includes support for setting/autotuning PIO modes and
          prefetch on CMD640 IDE interfaces.  For details, read

-         <file:Documentation/ide.txt>. If you have a CMD640 IDE interface
+         <file:Documentation/ide/ide.txt>. If you have a CMD640 IDE interface

          and your BIOS does not already do this for you, then say Y here.
          Otherwise say N.
 
          and your BIOS does not already do this for you, then say Y here.
          Otherwise say N.
 


@@ -416,12 +399,6 @@ config BLK_DEV_OFFBOARD
          This can improve the usability of some boot managers such as lilo
          when booting from a drive on an off-board controller.
 
          This can improve the usability of some boot managers such as lilo
          when booting from a drive on an off-board controller.
 

-         If you say Y here, and you actually want to reverse the device scan
-         order as explained above, you also need to issue the kernel command
-         line option "ide=reverse". (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.)
-

          Note that, if you do this, the order of the hd* devices will be
          rearranged which may require modification of fstab and other files.
 
          Note that, if you do this, the order of the hd* devices will be
          rearranged which may require modification of fstab and other files.
 


@@ -615,8 +592,7 @@ config BLK_DEV_HPT366
          reference to device 0x80. The other solution is to say Y to "Boot
          off-board chipsets first support" (CONFIG_BLK_DEV_OFFBOARD) unless
          your mother board has the chipset natively mounted. Regardless one
          reference to device 0x80. The other solution is to say Y to "Boot
          off-board chipsets first support" (CONFIG_BLK_DEV_OFFBOARD) unless
          your mother board has the chipset natively mounted. Regardless one

-         should use the fore mentioned option and call at LILO or include
-         "ide=reverse" in LILO's append-line.
+         should use the fore mentioned option and call at LILO.

 
          This driver requires dynamic tuning of the chipset during the
          ide-probe at boot. It is reported to support DVD II drives, by the
 
          This driver requires dynamic tuning of the chipset during the
          ide-probe at boot. It is reported to support DVD II drives, by the


@@ -1049,19 +1025,19 @@ config IDE_EXT_DIRECT
 endchoice
 
 # no isa -> no vlb
 endchoice
 
 # no isa -> no vlb

-if ISA
+if ISA && (ALPHA || X86 || MIPS)

 
 comment "Other IDE chipsets support"
 comment "Note: most of these also require special kernel boot parameters"
 
 config BLK_DEV_4DRIVES
 
 comment "Other IDE chipsets support"
 comment "Note: most of these also require special kernel boot parameters"
 
 config BLK_DEV_4DRIVES

-       bool "Generic 4 drives/port support"
+       tristate "Generic 4 drives/port support"

        help
          Certain older chipsets, including the Tekram 690CD, use a single set
          of I/O ports at 0x1f0 to control up to four drives, instead of the
          customary two drives per port. Support for this can be enabled at
        help
          Certain older chipsets, including the Tekram 690CD, use a single set
          of I/O ports at 0x1f0 to control up to four drives, instead of the
          customary two drives per port. Support for this can be enabled at

-         runtime using the "ide0=four" kernel boot parameter if you say Y
-         here.
+         runtime using the "ide-4drives.probe" kernel boot parameter if you
+         say Y here.

 
 config BLK_DEV_ALI14XX
        tristate "ALI M14xx support"
 
 config BLK_DEV_ALI14XX
        tristate "ALI M14xx support"


@@ -1069,9 +1045,9 @@ config BLK_DEV_ALI14XX
          This driver is enabled at runtime using the "ali14xx.probe" kernel
          boot parameter.  It enables support for the secondary IDE interface
          of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster
          This driver is enabled at runtime using the "ali14xx.probe" kernel
          boot parameter.  It enables support for the secondary IDE interface
          of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster

-         I/O speeds to be set as well.  See the files
-         <file:Documentation/ide.txt> and <file:drivers/ide/legacy/ali14xx.c>
-         for more info.
+         I/O speeds to be set as well.
+         See the files <file:Documentation/ide/ide.txt> and
+         <file:drivers/ide/legacy/ali14xx.c> for more info.

 
 config BLK_DEV_DTC2278
        tristate "DTC-2278 support"
 
 config BLK_DEV_DTC2278
        tristate "DTC-2278 support"


@@ -1079,7 +1055,7 @@ config BLK_DEV_DTC2278
          This driver is enabled at runtime using the "dtc2278.probe" kernel
          boot parameter. It enables support for the secondary IDE interface
          of the DTC-2278 card, and permits faster I/O speeds to be set as
          This driver is enabled at runtime using the "dtc2278.probe" kernel
          boot parameter. It enables support for the secondary IDE interface
          of the DTC-2278 card, and permits faster I/O speeds to be set as

-         well. See the <file:Documentation/ide.txt> and
+         well. See the <file:Documentation/ide/ide.txt> and

          <file:drivers/ide/legacy/dtc2278.c> files for more info.
 
 config BLK_DEV_HT6560B
          <file:drivers/ide/legacy/dtc2278.c> files for more info.
 
 config BLK_DEV_HT6560B


@@ -1088,7 +1064,7 @@ config BLK_DEV_HT6560B
          This driver is enabled at runtime using the "ht6560b.probe" kernel
          boot parameter. It enables support for the secondary IDE interface
          of the Holtek card, and permits faster I/O speeds to be set as well.
          This driver is enabled at runtime using the "ht6560b.probe" kernel
          boot parameter. It enables support for the secondary IDE interface
          of the Holtek card, and permits faster I/O speeds to be set as well.

-         See the <file:Documentation/ide.txt> and
+         See the <file:Documentation/ide/ide.txt> and

          <file:drivers/ide/legacy/ht6560b.c> files for more info.
 
 config BLK_DEV_QD65XX
          <file:drivers/ide/legacy/ht6560b.c> files for more info.
 
 config BLK_DEV_QD65XX


@@ -1096,7 +1072,7 @@ config BLK_DEV_QD65XX
        help
          This driver is enabled at runtime using the "qd65xx.probe" kernel
          boot parameter.  It permits faster I/O speeds to be set.  See the
        help
          This driver is enabled at runtime using the "qd65xx.probe" kernel
          boot parameter.  It permits faster I/O speeds to be set.  See the

-         <file:Documentation/ide.txt> and <file:drivers/ide/legacy/qd65xx.c>
+         <file:Documentation/ide/ide.txt> and <file:drivers/ide/legacy/qd65xx.c>

          for more info.
 
 config BLK_DEV_UMC8672
          for more info.
 
 config BLK_DEV_UMC8672


@@ -1105,7 +1081,7 @@ config BLK_DEV_UMC8672
          This driver is enabled at runtime using the "umc8672.probe" kernel
          boot parameter. It enables support for the secondary IDE interface
          of the UMC-8672, and permits faster I/O speeds to be set as well.
          This driver is enabled at runtime using the "umc8672.probe" kernel
          boot parameter. It enables support for the secondary IDE interface
          of the UMC-8672, and permits faster I/O speeds to be set as well.

-         See the files <file:Documentation/ide.txt> and
+         See the files <file:Documentation/ide/ide.txt> and

          <file:drivers/ide/legacy/umc8672.c> for more info.
 
 endif
          <file:drivers/ide/legacy/umc8672.c> for more info.
 
 endif


@@ -1114,14 +1090,10 @@ config BLK_DEV_IDEDMA
        def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \
                 BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
 
        def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \
                 BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
 

-config IDE_ARCH_OBSOLETE_INIT
-       def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC
-

 endif
 
 config BLK_DEV_HD_ONLY
        bool "Old hard disk (MFM/RLL/IDE) driver"
 endif
 
 config BLK_DEV_HD_ONLY
        bool "Old hard disk (MFM/RLL/IDE) driver"

-       depends on BLK_DEV_IDE=n

        help
          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
        help
          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


@@ -1133,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.
 
          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 "hda=noprobe hdb=noprobe" kernel parameters 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
          <http://www.tldp.org/docs.html#howto>.
 
 config BLK_DEV_HD
          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
          <http://www.tldp.org/docs.html#howto>.
 
 config BLK_DEV_HD

-       def_bool BLK_DEV_HD_IDE || BLK_DEV_HD_ONLY
+       def_bool BLK_DEV_HD_ONLY

 
 endif # IDE
 
 endif # IDE