Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

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

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index ec58f19..fc96b0d 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,6 +95,26 @@ if BLK_DEV_IDE
 
 comment "Please see Documentation/ide.txt for help/info on IDE drives"
 
+config BLK_DEV_IDE_SATA
+       bool "Support for SATA (deprecated; conflicts with libata SATA driver)"
+       default n
+       ---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 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 || SH_MPC1211)