e1000e: fix pci-device enable-counter balance

[linux-2.6-microblaze.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 4cfb720..3e751b7 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -58,6 +58,19 @@ config ATA_ACPI
          You can disable this at kernel boot time by using the
          option libata.noacpi=1
 
+config SATA_ZPODD
+       bool "SATA Zero Power ODD Support"
+       depends on ATA_ACPI
+       default n
+       help
+         This option adds support for SATA ZPODD. It requires both
+         ODD and the platform support, and if enabled, will automatically
+         power on/off the ODD when certain condition is satisfied. This
+         does not impact user's experience of the ODD, only power is saved
+         when ODD is not in use(i.e. no disc inside).
+
+         If unsure, say N.
+
 config SATA_PMP
        bool "SATA Port Multiplier support"
        default y
@@ -247,6 +260,14 @@ config SATA_PROMISE
 
          If unsure, say N.
 
+config SATA_RCAR
+       tristate "Renesas R-Car SATA support"
+       depends on ARCH_SHMOBILE && ARCH_R8A7779
+       help
+         This option enables support for Renesas R-Car Serial ATA.
+
+         If unsure, say N.
+
 config SATA_SIL
        tristate "Silicon Image SATA support"
        depends on PCI