diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-04 09:04:08 +0300 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-05 16:55:52 +0300 |
commit | 8dc0a56529f5d60bbb927049d48245b1a7989bf8 (patch) | |
tree | bf1a12dcae17094441e2b4d9a550e212d0d82006 /drivers/ata/Kconfig | |
parent | 516034787e06834816e9a0435499690704f01c47 (diff) | |
parent | 0c534938663af8d2ca2a89bed07e8c0e624352a0 (diff) | |
download | linux-8dc0a56529f5d60bbb927049d48245b1a7989bf8.tar.xz |
Merge branch 'ti-dra7-dss' into 4.2/fbdev
Merge arch/ changes for TI's DRA7 SoC Display Subsystem.
Diffstat (limited to 'drivers/ata/Kconfig')
-rw-r--r-- | drivers/ata/Kconfig | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 5f601553b9b0..9dca4b995be0 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -270,6 +270,7 @@ config ATA_PIIX config SATA_DWC tristate "DesignWare Cores SATA support" depends on 460EX + select DW_DMAC help This option enables support for the on-chip SATA controller of the AppliedMicro processor 460EX. @@ -729,15 +730,6 @@ config PATA_SC1200 If unsure, say N. -config PATA_SCC - tristate "Toshiba's Cell Reference Set IDE support" - depends on PCI && PPC_CELLEB - help - This option enables support for the built-in IDE controller on - Toshiba Cell Reference Board. - - If unsure, say N. - config PATA_SCH tristate "Intel SCH PATA support" depends on PCI |