diff options
author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /drivers/ata/Kconfig | |
parent | 8851b9f1625ce0858e9b1bb0ae4a57d4b43178b1 (diff) | |
parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'drivers/ata/Kconfig')
-rw-r--r-- | drivers/ata/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 80dc988f01e4..4e737728aee2 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -97,6 +97,15 @@ config SATA_AHCI_PLATFORM | |||
97 | 97 | ||
98 | If unsure, say N. | 98 | If unsure, say N. |
99 | 99 | ||
100 | config AHCI_IMX | ||
101 | tristate "Freescale i.MX AHCI SATA support" | ||
102 | depends on SATA_AHCI_PLATFORM && MFD_SYSCON | ||
103 | help | ||
104 | This option enables support for the Freescale i.MX SoC's | ||
105 | onboard AHCI SATA. | ||
106 | |||
107 | If unsure, say N. | ||
108 | |||
100 | config SATA_FSL | 109 | config SATA_FSL |
101 | tristate "Freescale 3.0Gbps SATA support" | 110 | tristate "Freescale 3.0Gbps SATA support" |
102 | depends on FSL_SOC | 111 | depends on FSL_SOC |
@@ -107,7 +116,7 @@ config SATA_FSL | |||
107 | If unsure, say N. | 116 | If unsure, say N. |
108 | 117 | ||
109 | config SATA_INIC162X | 118 | config SATA_INIC162X |
110 | tristate "Initio 162x SATA support" | 119 | tristate "Initio 162x SATA support (Very Experimental)" |
111 | depends on PCI | 120 | depends on PCI |
112 | help | 121 | help |
113 | This option enables support for Initio 162x Serial ATA. | 122 | This option enables support for Initio 162x Serial ATA. |