cxgb3 - detect NIC only adapters

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

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index ea102c0..7bdbe5a 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -41,12 +41,12 @@ config SATA_SVW
          If unsure, say N.
 
 config ATA_PIIX
-       tristate "Intel PIIX/ICH SATA support"
+       tristate "Intel ESB, ICH, PIIX3, PIIX4 PATA/SATA support"
        depends on PCI
        help
          This option enables support for ICH5/6/7/8 Serial ATA
-         and support for PATA on the Intel PIIX3/PIIX4/ICH series
-         PATA host controllers.
+         and support for PATA on the Intel ESB/ICH/PIIX3/PIIX4 series
+         host controllers.
 
          If unsure, say N.
 
@@ -116,11 +116,14 @@ config SATA_SIL24
          If unsure, say N.
 
 config SATA_SIS
-       tristate "SiS 964/180 SATA support"
+       tristate "SiS 964/965/966/180 SATA support"
        depends on PCI
+       select PATA_SIS
        help
-         This option enables support for SiS Serial ATA 964/180.
-
+         This option enables support for SiS Serial ATA on 
+         SiS 964/965/966/180 and Parallel ATA on SiS 180.
+         The PATA support for SiS 180 requires additionally to
+         enable the PATA_SIS driver in the config.
          If unsure, say N.
 
 config SATA_ULI
@@ -158,6 +161,19 @@ config SATA_INTEL_COMBINED
        depends on IDE=y && !BLK_DEV_IDE_SATA && (SATA_AHCI || ATA_PIIX)
        default y
 
+config SATA_ACPI
+       bool
+       depends on ACPI && PCI
+       default y
+       help
+         This option adds support for SATA-related ACPI objects.
+         These ACPI objects add the ability to retrieve taskfiles
+         from the ACPI BIOS and write them to the disk controller.
+         These objects may be related to performance, security,
+         power management, or other areas.
+         You can disable this at kernel boot time by using the
+         option libata.noacpi=1
+
 config PATA_ALI
        tristate "ALi PATA support (Experimental)"
        depends on PCI && EXPERIMENTAL
@@ -546,6 +562,15 @@ config PATA_IXP4XX_CF
 
          If unsure, say N.
 
+config PATA_SCC
+       tristate "Toshiba's Cell Reference Set IDE support"
+       depends on PCI && PPC_CELLEB
+       help
+         This option enables support for the built-in IDE controller on
+         Toshiba Cell Reference Board.
+
+         If unsure, say N.
+
 endif
 endmenu