Merge branches 'master' and 'devel' into for-linus

[sfrench/cifs-2.6.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 25e030f9a3e616ae121e38074a96e640855b1574..65e3e2708371962a3878061a8b71666230e80c2c 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -187,6 +187,15 @@ config ATA_PIIX
 
          If unsure, say N.
 
+config SATA_DWC
+       tristate "DesignWare Cores SATA support"
+       depends on 460EX
+       help
+         This option enables support for the on-chip SATA controller of the
+         AppliedMicro processor 460EX.
+
+         If unsure, say N.
+
 config SATA_MV
        tristate "Marvell SATA support"
        help
@@ -807,6 +816,15 @@ config PATA_RZ1000
 
          If unsure, say N.
 
+config PATA_SAMSUNG_CF
+       tristate "Samsung SoC PATA support"
+       depends on SAMSUNG_DEV_IDE
+       help
+         This option enables basic support for Samsung's S3C/S5P board
+         PATA controllers via the new ATA layer
+
+         If unsure, say N.
+
 config PATA_WINBOND_VLB
        tristate "Winbond W83759A VLB PATA support (Experimental)"
        depends on ISA && EXPERIMENTAL