ide: legacy PCI bus order probing fixes

[pandora-kernel.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 49234e3..1d06b41 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -57,6 +57,7 @@ if IDE
 config IDE_MAX_HWIFS
        int "Max IDE interfaces"
        depends on ALPHA || SUPERH || IA64 || EMBEDDED
 config IDE_MAX_HWIFS
        int "Max IDE interfaces"
        depends on ALPHA || SUPERH || IA64 || EMBEDDED

+       range 1 10

        default 4
        help
          This is the maximum number of IDE hardware interfaces that will
        default 4
        help
          This is the maximum number of IDE hardware interfaces that will


@@ -103,8 +104,10 @@ config BLK_DEV_IDE_SATA
        ---help---
          There are two drivers for Serial ATA controllers.
 
        ---help---
          There are two drivers for Serial ATA controllers.
 

-         The main driver, "libata", exists inside the SCSI subsystem
-         and supports most modern SATA controllers.
+         The main driver, "libata", uses the SCSI subsystem
+         and supports most modern SATA controllers. In order to use it
+         you may take a look at "Serial ATA (prod) and Parallel ATA
+         (experimental) drivers".

 
          The IDE driver (which you are currently configuring) supports
          a few first-generation SATA controllers.
 
          The IDE driver (which you are currently configuring) supports
          a few first-generation SATA controllers.


@@ -288,6 +291,17 @@ config IDE_TASK_IOCTL
 
          If you are unsure, say N here.
 
 
          If you are unsure, say N here.
 

+config IDE_PROC_FS
+       bool "legacy /proc/ide/ support"
+       depends on IDE && PROC_FS
+       default y
+       help
+         This option enables support for the various files in
+         /proc/ide.  In Linux 2.6 this has been superseded by
+         files in sysfs but many legacy applications rely on this.
+
+         If unsure say Y.
+

 comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
 comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC


@@ -357,6 +371,9 @@ config IDEPCI_SHARE_IRQ
          It is safe to say Y to this question, in most cases.
          If unsure, say N.
 
          It is safe to say Y to this question, in most cases.
          If unsure, say N.
 

+config IDEPCI_PCIBUS_ORDER
+       def_bool PCI && BLK_DEV_IDE=y && BLK_DEV_IDEPCI
+

 config BLK_DEV_OFFBOARD
        bool "Boot off-board chipsets first support"
        depends on PCI && BLK_DEV_IDEPCI
 config BLK_DEV_OFFBOARD
        bool "Boot off-board chipsets first support"
        depends on PCI && BLK_DEV_IDEPCI


@@ -434,24 +451,8 @@ config BLK_DEV_IDEDMA_FORCED
 
          Generally say N here.
 
 
          Generally say N here.
 

-config IDEDMA_PCI_AUTO
-       bool "Use PCI DMA by default when available"
-       ---help---
-         Prior to kernel version 2.1.112, Linux used to automatically use
-         DMA for IDE drives and chipsets which support it. Due to concerns
-         about a couple of cases where buggy hardware may have caused damage,
-         the default is now to NOT use DMA automatically. To revert to the
-         previous behaviour, say Y to this question.
-
-         If you suspect your hardware is at all flakey, say N here.
-         Do NOT email the IDE kernel people regarding this issue!
-
-         It is normally safe to answer Y to this question unless your
-         motherboard uses a VIA VP2 chipset, in which case you should say N.
-

 config IDEDMA_ONLYDISK
        bool "Enable DMA only for disks "
 config IDEDMA_ONLYDISK
        bool "Enable DMA only for disks "

-       depends on IDEDMA_PCI_AUTO

        help
          This is used if you know your ATAPI Devices are going to fail DMA
          Transfers.
        help
          This is used if you know your ATAPI Devices are going to fail DMA
          Transfers.


@@ -769,6 +770,14 @@ config BLK_DEV_TC86C001
        help
        This driver adds support for Toshiba TC86C001 GOKU-S chip.
 
        help
        This driver adds support for Toshiba TC86C001 GOKU-S chip.
 

+config BLK_DEV_CELLEB
+       tristate "Toshiba's Cell Reference Set IDE support"
+       depends on PPC_CELLEB
+       help
+         This driver provides support for the built-in IDE controller on
+         Toshiba Cell Reference Board.
+         If unsure, say Y.
+

 endif
 
 config BLK_DEV_IDE_PMAC
 endif
 
 config BLK_DEV_IDE_PMAC


@@ -800,14 +809,6 @@ config BLK_DEV_IDEDMA_PMAC
          to transfer data to and from memory.  Saying Y is safe and improves
          performance.
 
          to transfer data to and from memory.  Saying Y is safe and improves
          performance.
 

-config BLK_DEV_IDE_CELLEB
-       bool "Toshiba's Cell Reference Set IDE support"
-       depends on PPC_CELLEB
-       help
-         This driver provides support for the built-in IDE controller on
-         Toshiba Cell Reference Board.
-         If unsure, say Y.
-

 config BLK_DEV_IDE_SWARM
        tristate "IDE for Sibyte evaluation boards"
        depends on SIBYTE_SB1xxx_SOC
 config BLK_DEV_IDE_SWARM
        tristate "IDE for Sibyte evaluation boards"
        depends on SIBYTE_SB1xxx_SOC


@@ -851,19 +852,6 @@ config BLK_DEV_IDEDMA_ICS
          Say Y here if you want to add DMA (Direct Memory Access) support to
          the ICS IDE driver.
 
          Say Y here if you want to add DMA (Direct Memory Access) support to
          the ICS IDE driver.
 

-config IDEDMA_ICS_AUTO
-       bool "Use ICS DMA by default"
-       depends on BLK_DEV_IDEDMA_ICS
-       help
-         Prior to kernel version 2.1.112, Linux used to automatically use
-         DMA for IDE drives and chipsets which support it. Due to concerns
-         about a couple of cases where buggy hardware may have caused damage,
-         the default is now to NOT use DMA automatically. To revert to the
-         previous behaviour, say Y to this question.
-
-         If you suspect your hardware is at all flakey, say N here.
-         Do NOT email the IDE kernel people regarding this issue!
-

 config BLK_DEV_IDE_RAPIDE
        tristate "RapIDE interface support"
        depends on ARM && ARCH_ACORN
 config BLK_DEV_IDE_RAPIDE
        tristate "RapIDE interface support"
        depends on ARM && ARCH_ACORN


@@ -1023,7 +1011,7 @@ config BLK_DEV_4DRIVES
 config BLK_DEV_ALI14XX
        tristate "ALI M14xx support"
        help
 config BLK_DEV_ALI14XX
        tristate "ALI M14xx support"
        help

-         This driver is enabled at runtime using the "ide0=ali14xx" kernel
+         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
          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


@@ -1033,7 +1021,7 @@ config BLK_DEV_ALI14XX
 config BLK_DEV_DTC2278
        tristate "DTC-2278 support"
        help
 config BLK_DEV_DTC2278
        tristate "DTC-2278 support"
        help

-         This driver is enabled at runtime using the "ide0=dtc2278" kernel
+         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
          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


@@ -1042,7 +1030,7 @@ config BLK_DEV_DTC2278
 config BLK_DEV_HT6560B
        tristate "Holtek HT6560B support"
        help
 config BLK_DEV_HT6560B
        tristate "Holtek HT6560B support"
        help

-         This driver is enabled at runtime using the "ide0=ht6560b" kernel
+         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
          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


@@ -1051,7 +1039,7 @@ config BLK_DEV_HT6560B
 config BLK_DEV_QD65XX
        tristate "QDI QD65xx support"
        help
 config BLK_DEV_QD65XX
        tristate "QDI QD65xx support"
        help

-         This driver is enabled at runtime using the "ide0=qd65xx" kernel
+         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> for
          more info.
          boot parameter.  It permits faster I/O speeds to be set.  See the
          <file:Documentation/ide.txt> and <file:drivers/ide/legacy/qd65xx.c> for
          more info.


@@ -1059,7 +1047,7 @@ config BLK_DEV_QD65XX
 config BLK_DEV_UMC8672
        tristate "UMC-8672 support"
        help
 config BLK_DEV_UMC8672
        tristate "UMC-8672 support"
        help

-         This driver is enabled at runtime using the "ide0=umc8672" kernel
+         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
          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


@@ -1086,9 +1074,6 @@ config IDEDMA_IVB
 
          It is normally safe to answer Y; however, the default is N.
 
 
          It is normally safe to answer Y; however, the default is N.
 

-config IDEDMA_AUTO
-       def_bool IDEDMA_PCI_AUTO || IDEDMA_ICS_AUTO
-

 endif
 
 config BLK_DEV_HD_ONLY
 endif
 
 config BLK_DEV_HD_ONLY