Merge remote-tracking branch 'asoc/fix/ux500' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 3c4417a1d438d55c0d5d2ea5219d7fdc47f236f3..02906ca99b41c4583ca6c3adb18f309ec88ffad5 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -700,11 +700,6 @@ config BLK_DEV_IDE_TX4939
        depends on SOC_TX4939
        select BLK_DEV_IDEDMA_SFF
 
-config BLK_DEV_IDE_AT91
-       tristate "Atmel AT91 (SAM9, CAP9, AT572D940HF) IDE support"
-       depends on ARM && ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_AT91X40
-       select IDE_TIMINGS
-
 config BLK_DEV_IDE_ICSIDE
        tristate "ICS IDE interface support"
        depends on ARM && ARCH_ACORN