ide-cris: fix ->set_pio_mode method to set transfer mode on the device

[safe/jmp/linux-2.6] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index ec03341..7adb61b 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -4,12 +4,10 @@
 # Andre Hedrick <andre@linux-ide.org>
 #
 
 # Andre Hedrick <andre@linux-ide.org>
 #
 

-if BLOCK
-
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
+menuconfig IDE

        tristate "ATA/ATAPI/MFM/RLL support"
        tristate "ATA/ATAPI/MFM/RLL support"

+       depends on BLOCK
+       depends on HAS_IOMEM

        ---help---
          If you say Y here, your kernel will be able to manage low cost mass
          storage units such as ATA/(E)IDE and ATAPI units. The most common
        ---help---
          If you say Y here, your kernel will be able to manage low cost mass
          storage units such as ATA/(E)IDE and ATAPI units. The most common


@@ -57,6 +55,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 +102,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,13 +289,24 @@ 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
        tristate "generic/default IDE chipset support"
 comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
        tristate "generic/default IDE chipset support"

-       default y
+       default H8300

        help
        help

-         If unsure, say Y.
+         If unsure, say N.

 
 config BLK_DEV_CMD640
        bool "CMD640 chipset bugfix/support"
 
 config BLK_DEV_CMD640
        bool "CMD640 chipset bugfix/support"


@@ -333,6 +345,7 @@ config BLK_DEV_CMD640_ENHANCED
 config BLK_DEV_IDEPNP
        bool "PNP EIDE support"
        depends on PNP
 config BLK_DEV_IDEPNP
        bool "PNP EIDE support"
        depends on PNP

+       select IDE_GENERIC

        help
          If you have a PnP (Plug and Play) compatible EIDE card and
          would like the kernel to automatically detect and activate
        help
          If you have a PnP (Plug and Play) compatible EIDE card and
          would like the kernel to automatically detect and activate


@@ -357,6 +370,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


@@ -383,6 +399,9 @@ config BLK_DEV_OFFBOARD
 config BLK_DEV_GENERIC
        tristate "Generic PCI IDE Chipset Support"
        depends on BLK_DEV_IDEPCI
 config BLK_DEV_GENERIC
        tristate "Generic PCI IDE Chipset Support"
        depends on BLK_DEV_IDEPCI

+        help
+          This option provides generic support for various PCI IDE Chipsets
+          which otherwise might not be supported.

 
 config BLK_DEV_OPTI621
        tristate "OPTi 82C621 chipset enhanced support (EXPERIMENTAL)"
 
 config BLK_DEV_OPTI621
        tristate "OPTi 82C621 chipset enhanced support (EXPERIMENTAL)"


@@ -431,24 +450,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.


@@ -766,6 +769,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


@@ -823,7 +834,8 @@ config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        depends on BLK_DEV_IDE_AU1XXX
 
 config IDE_ARM
        depends on BLK_DEV_IDE_AU1XXX
 
 config IDE_ARM

-       def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
+       def_bool ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
+       select IDE_GENERIC

 
 config BLK_DEV_IDE_ICSIDE
        tristate "ICS IDE interface support"
 
 config BLK_DEV_IDE_ICSIDE
        tristate "ICS IDE interface support"


@@ -840,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


@@ -870,6 +869,7 @@ config BLK_DEV_IDE_BAST
 config BLK_DEV_GAYLE
        bool "Amiga Gayle IDE interface support"
        depends on AMIGA
 config BLK_DEV_GAYLE
        bool "Amiga Gayle IDE interface support"
        depends on AMIGA

+       select IDE_GENERIC

        help
          This is the IDE driver for the Amiga Gayle IDE interface. It supports
          both the `A1200 style' and `A4000 style' of the Gayle IDE interface,
        help
          This is the IDE driver for the Amiga Gayle IDE interface. It supports
          both the `A1200 style' and `A4000 style' of the Gayle IDE interface,


@@ -901,6 +901,7 @@ config BLK_DEV_IDEDOUBLER
 config BLK_DEV_BUDDHA
        bool "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"
        depends on ZORRO && EXPERIMENTAL
 config BLK_DEV_BUDDHA
        bool "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"
        depends on ZORRO && EXPERIMENTAL

+       select IDE_GENERIC

        help
          This is the IDE driver for the IDE interfaces on the Buddha, 
          Catweasel and X-Surf expansion boards.  It supports up to two interfaces 
        help
          This is the IDE driver for the IDE interfaces on the Buddha, 
          Catweasel and X-Surf expansion boards.  It supports up to two interfaces 


@@ -913,6 +914,7 @@ config BLK_DEV_BUDDHA
 config BLK_DEV_FALCON_IDE
        bool "Falcon IDE interface support"
        depends on ATARI
 config BLK_DEV_FALCON_IDE
        bool "Falcon IDE interface support"
        depends on ATARI

+       select IDE_GENERIC

        help
          This is the IDE driver for the builtin IDE interface on the Atari
          Falcon. Say Y if you have a Falcon and want to use IDE devices (hard
        help
          This is the IDE driver for the builtin IDE interface on the Atari
          Falcon. Say Y if you have a Falcon and want to use IDE devices (hard


@@ -922,6 +924,7 @@ config BLK_DEV_FALCON_IDE
 config BLK_DEV_MAC_IDE
        bool "Macintosh Quadra/Powerbook IDE interface support"
        depends on MAC
 config BLK_DEV_MAC_IDE
        bool "Macintosh Quadra/Powerbook IDE interface support"
        depends on MAC

+       select IDE_GENERIC

        help
          This is the IDE driver for the builtin IDE interface on some m68k
          Macintosh models. It supports both the `Quadra style' (used in
        help
          This is the IDE driver for the builtin IDE interface on some m68k
          Macintosh models. It supports both the `Quadra style' (used in


@@ -935,6 +938,7 @@ config BLK_DEV_MAC_IDE
 config BLK_DEV_Q40IDE
        bool "Q40/Q60 IDE interface support"
        depends on Q40
 config BLK_DEV_Q40IDE
        bool "Q40/Q60 IDE interface support"
        depends on Q40

+       select IDE_GENERIC

        help
          Enable the on-board IDE controller in the Q40/Q60.  This should
          normally be on; disable it only if you are running a custom hard
        help
          Enable the on-board IDE controller in the Q40/Q60.  This should
          normally be on; disable it only if you are running a custom hard


@@ -943,6 +947,7 @@ config BLK_DEV_Q40IDE
 config BLK_DEV_MPC8xx_IDE
        bool "MPC8xx IDE support"
        depends on 8xx && IDE=y && BLK_DEV_IDE=y
 config BLK_DEV_MPC8xx_IDE
        bool "MPC8xx IDE support"
        depends on 8xx && IDE=y && BLK_DEV_IDE=y

+       select IDE_GENERIC

        help
          This option provides support for IDE on Motorola MPC8xx Systems.
          Please see 'Type of MPC8xx IDE interface' for details.
        help
          This option provides support for IDE on Motorola MPC8xx Systems.
          Please see 'Type of MPC8xx IDE interface' for details.


@@ -1012,7 +1017,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


@@ -1022,7 +1027,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


@@ -1031,7 +1036,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


@@ -1040,7 +1045,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.


@@ -1048,7 +1053,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


@@ -1075,9 +1080,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


@@ -1102,8 +1104,4 @@ config BLK_DEV_HD_ONLY
 config BLK_DEV_HD
        def_bool BLK_DEV_HD_IDE || BLK_DEV_HD_ONLY
 
 config BLK_DEV_HD
        def_bool BLK_DEV_HD_IDE || BLK_DEV_HD_ONLY
 

-endif
-
-endmenu
-
-endif
+endif # IDE