VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 91e9282..f28496b 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -54,7 +54,7 @@ if IDE
 
 config IDE_MAX_HWIFS 
        int "Max IDE interfaces"
-       depends on ALPHA
+       depends on ALPHA || SUPERH
        default 4
        help
          This is the maximum number of IDE hardware interfaces that will
@@ -95,27 +95,29 @@ if BLK_DEV_IDE
 
 comment "Please see Documentation/ide.txt for help/info on IDE drives"
 
-config BLK_DEV_HD_IDE
-       bool "Use old disk-only driver on primary interface"
-       depends on ((X86 && X86_PC9800!=y) || SH_MPC1211)
+config BLK_DEV_IDE_SATA
+       bool "Support for SATA (deprecated; conflicts with libata SATA driver)"
+       default n
        ---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.
+         There are two drivers for Serial ATA controllers.
 
-         Normally, just say N here; you will then use the new driver for all
-         4 interfaces.
+         The main driver, "libata", exists inside the SCSI subsystem
+         and supports most modern SATA controllers.
 
-config BLK_DEV_HD_IDE98
+         The IDE driver (which you are currently configuring) supports
+         a few first-generation SATA controllers.
+
+         In order to eliminate conflicts between the two subsystems,
+         this config option enables the IDE driver's SATA support.
+         Normally this is disabled, as it is preferred that libata
+         supports SATA controllers, and this (IDE) driver supports
+         PATA controllers.
+
+         If unsure, say N.
+
+config BLK_DEV_HD_IDE
        bool "Use old disk-only driver on primary interface"
-       depends on X86 && X86_PC9800
+       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
@@ -751,7 +753,7 @@ endif
 
 config BLK_DEV_IDE_PMAC
        bool "Builtin PowerMac IDE support"
-       depends on PPC_PMAC
+       depends on PPC_PMAC && IDE=y
        help
          This driver provides support for the built-in IDE controller on
          most of the recent Apple Power Macintoshes and PowerBooks.