Merge branch 'merge-fixes' into devel

1 files changed, 46 insertions, 18 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 25aba69b59b4..292aa9a0f02f 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -28,7 +28,7 @@ config ATA_NONSTANDARD
        default n
 
 config ATA_ACPI
-        bool
+        bool "ATA ACPI Support"
         depends on ACPI && PCI
         select ACPI_DOCK
         default y
@@ -41,6 +41,13 @@ config ATA_ACPI
           You can disable this at kernel boot time by using the
           option libata.noacpi=1
 
+config SATA_PMP
+        bool "SATA Port Multiplier support"
+        default y
+        help
+          This option adds support for SATA Port Multipliers
+          (the SATA version of an ethernet hub, or SAS expander).
+
 config SATA_AHCI
         tristate "AHCI SATA support"
         depends on PCI
@@ -49,6 +56,43 @@ config SATA_AHCI
 
           If unsure, say N.
 
+config SATA_SIL24
+        tristate "Silicon Image 3124/3132 SATA support"
+        depends on PCI
+        help
+          This option enables support for Silicon Image 3124/3132 Serial ATA.
+
+          If unsure, say N.
+
+config SATA_FSL
+        tristate "Freescale 3.0Gbps SATA support"
+        depends on FSL_SOC
+        help
+          This option enables support for Freescale 3.0Gbps SATA controller.
+          It can be found on MPC837x and MPC8315.
+
+          If unsure, say N.
+
+config ATA_SFF
+        bool "ATA SFF support"
+        default y
+        help
+          This option adds support for ATA controllers with SFF
+          compliant or similar programming interface.
+
+          SFF is the legacy IDE interface that has been around since
+          the dawn of time.  Almost all PATA controllers have an
+          SFF interface.  Many SATA controllers have an SFF interface
+          when configured into a legacy compatibility mode.
+
+          For users with exclusively modern controllers like AHCI,
+          Silicon Image 3124, or Marvell 6440, you may choose to
+          disable this uneeded SFF support.
+
+          If unsure, say Y.
+
+if ATA_SFF
+
 config SATA_SVW
         tristate "ServerWorks Frodo / Apple K2 SATA support"
         depends on PCI
@@ -125,14 +169,6 @@ config SATA_SIL
 
           If unsure, say N.
 
-config SATA_SIL24
-        tristate "Silicon Image 3124/3132 SATA support"
-        depends on PCI
-        help
-          This option enables support for Silicon Image 3124/3132 Serial ATA.
-
-          If unsure, say N.
-
 config SATA_SIS
         tristate "SiS 964/965/966/180 SATA support"
         depends on PCI
@@ -183,15 +219,6 @@ config PATA_ACPI
           firmware in the BIOS. This driver can sometimes handle
           otherwise unsupported hardware.
 
-config SATA_FSL
-        tristate "Freescale 3.0Gbps SATA support"
-        depends on FSL_SOC
-        help
-          This option enables support for Freescale 3.0Gbps SATA controller.
-          It can be found on MPC837x and MPC8315.
-
-          If unsure, say N.
-
 config PATA_ALI
         tristate "ALi PATA support (Experimental)"
         depends on PCI && EXPERIMENTAL
@@ -679,4 +706,5 @@ config PATA_BF54X
 
           If unsure, say N.
 
+endif # ATA_SFF
 endif # ATA