---

yaml
---
r: 89289
b: refs/heads/master
c: f3360eb
h: refs/heads/master
i:
  89287: 6b9bd14
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f7faa3f2b99f8fb246c8cdeef971e55ceda4e52
+refs/heads/master: f3360ebffae254ab99a64bf97c7b4f8380b1e114

trunk/drivers/ata/Kconfig

@@ -45,7 +45,8 @@ config SATA_PMP
 	bool "SATA Port Multiplier support"
 	default y
 	help
-	  This option adds support for SATA Port Multipliers.
+	  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"
@@ -79,6 +80,17 @@ config ATA_SFF
 	  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