Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

[sfrench/cifs-2.6.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index d1e8df187222a92e9946ac295d9e860caa306c39..fb06555708a8d431734a99e0a1a85cf3f7178139 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -203,10 +203,6 @@ config BLK_DEV_IDECD
          CD-ROM drive, you can say N to all other CD-ROM options, but be sure
          to say Y or M to "ISO 9660 CD-ROM file system support".
 
-         Note that older versions of LILO (LInux LOader) cannot properly deal
-         with IDE/ATAPI CD-ROMs, so install LILO 16 or higher, available from
-         <http://lilo.go.dyndns.org/>.
-
          To compile this driver as a module, choose M here: the
          module will be called ide-cd.
 
@@ -317,7 +313,6 @@ comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
        tristate "generic/default IDE chipset support"
-       default H8300
        help
          If unsure, say N.
 
@@ -395,7 +390,7 @@ config IDEPCI_PCIBUS_ORDER
 
 # TODO: split it on per host driver config options (or module parameters)
 config BLK_DEV_OFFBOARD
-       bool "Boot off-board chipsets first support"
+       bool "Boot off-board chipsets first support (DEPRECATED)"
        depends on BLK_DEV_IDEPCI && (BLK_DEV_AEC62XX || BLK_DEV_GENERIC || BLK_DEV_HPT34X || BLK_DEV_HPT366 || BLK_DEV_PDC202XX_NEW || BLK_DEV_PDC202XX_OLD || BLK_DEV_TC86C001)
        help
          Normally, IDE controllers built into the motherboard (on-board
@@ -415,6 +410,10 @@ config BLK_DEV_OFFBOARD
          Note that, if you do this, the order of the hd* devices will be
          rearranged which may require modification of fstab and other files.
 
+         Please also note that this method of assuring stable naming of
+         IDE devices is unreliable and use other means for achieving it
+         (i.e. udev).
+
          If in doubt, say N.
 
 config BLK_DEV_GENERIC
@@ -488,6 +487,7 @@ config WDC_ALI15X3
 
 config BLK_DEV_AMD74XX
        tristate "AMD and nVidia IDE support"
+       depends on !ARM
        select BLK_DEV_IDEDMA_PCI
        help
          This driver adds explicit support for AMD-7xx and AMD-8111 chips
@@ -887,6 +887,49 @@ config BLK_DEV_IDE_BAST
          Say Y here if you want to support the onboard IDE channels on the
          Simtec BAST or the Thorcom VR1000
 
+config ETRAX_IDE
+       bool "ETRAX IDE support"
+       depends on CRIS && BROKEN
+       select BLK_DEV_IDEDMA
+       select IDE_GENERIC
+       help
+         Enables the ETRAX IDE driver.
+
+         You can't use parallel ports or SCSI ports at the same time.
+
+config ETRAX_IDE_DELAY
+       int "Delay for drives to regain consciousness"
+       depends on ETRAX_IDE && ETRAX_ARCH_V10
+       default 15
+       help
+         Number of seconds to wait for IDE drives to spin up after an IDE
+         reset.
+
+choice
+       prompt "IDE reset pin"
+       depends on ETRAX_IDE && ETRAX_ARCH_V10
+       default ETRAX_IDE_PB7_RESET
+
+config ETRAX_IDE_PB7_RESET
+       bool "Port_PB_Bit_7"
+       help
+         IDE reset on pin 7 on port B
+
+config ETRAX_IDE_G27_RESET
+       bool "Port_G_Bit_27"
+       help
+         IDE reset on pin 27 on port G
+
+endchoice
+
+config IDE_H8300
+       bool "H8300 IDE support"
+       depends on H8300
+       select IDE_GENERIC
+       default y
+       help
+         Enables the H8300 IDE driver.
+
 config BLK_DEV_GAYLE
        bool "Amiga Gayle IDE interface support"
        depends on AMIGA
@@ -967,7 +1010,7 @@ config BLK_DEV_Q40IDE
 
 config BLK_DEV_MPC8xx_IDE
        bool "MPC8xx IDE support"
-       depends on 8xx && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE
+       depends on 8xx && (LWMON || IVMS8 || IVML24 || TQM8xxL) && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE
        select IDE_GENERIC
        help
          This option provides support for IDE on Motorola MPC8xx Systems.