Merge tag 'ata-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

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

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 2fa9e66ba824b74722741320b355695a55d84a58..b56fba76b43f48f7ccd29f094149282ce4fb612a 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -640,6 +640,7 @@ config PATA_CS5530
 config PATA_CS5535
        tristate "CS5535 PATA support (Experimental)"
        depends on PCI && (X86_32 || (X86_64 && COMPILE_TEST))
+       depends on !UML
        help
          This option enables support for the NatSemi/AMD CS5535
          companion chip used with the Geode processor family.
@@ -1082,15 +1083,6 @@ config PATA_OPTI
 
          If unsure, say N.
 
-config PATA_PALMLD
-       tristate "Palm LifeDrive PATA support"
-       depends on MACH_PALMLD
-       help
-         This option enables support for Palm LifeDrive's internal ATA
-         port via the new ATA layer.
-
-         If unsure, say N.
-
 config PATA_PCMCIA
        tristate "PCMCIA PATA support"
        depends on PCMCIA
@@ -1144,16 +1136,6 @@ config PATA_RZ1000
 
          If unsure, say N.
 
-config PATA_SAMSUNG_CF
-       tristate "Samsung SoC PATA support"
-       depends on SAMSUNG_DEV_IDE || COMPILE_TEST
-       select PATA_TIMINGS
-       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