diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-04 03:42:25 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-04 03:42:25 +0300 |
| commit | a23867f1d2de572f84b459651dfe99fa9e79fadf (patch) | |
| tree | ae3cecc903408653646986aa03b5361ef5ae1204 /drivers/ata/Kconfig | |
| parent | ef1c4a6fa91bbbe9b09f770d28eba31a9edf770c (diff) | |
| parent | 027fa4dee935d25cef5994af1b8864eb00dcffac (diff) | |
| download | linux-a23867f1d2de572f84b459651dfe99fa9e79fadf.tar.xz | |
Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata updates from Tejun Heo:
"Nothing too interesting.
The biggest change is refcnting fix for ata_host - the bug is recent
and can only be triggered on controller hotplug, so very few are
hitting it.
There also are a number of trivial license / error message changes and
some hardware specific changes"
* 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (23 commits)
ahci: imx: add the imx8qm ahci sata support
libata: ensure host is free'd on error exit paths
ata: ahci-platform: add reset control support
ahci: imx: fix the build warning
ata: add Amiga Gayle PATA controller driver
ahci: imx: add the imx6qp ahci sata support
ata: change Tegra124 to Tegra
ata: ahci_tegra: Add AHCI support for Tegra210
ata: ahci_tegra: disable DIPM
ata: ahci_tegra: disable devslp for Tegra124
ata: ahci_tegra: initialize regulators from soc struct
ata: ahci_tegra: Update initialization sequence
dt-bindings: Tegra210: add binding documentation
libata: add refcounting to ata_host
pata_bk3710: clarify license version and use SPDX header
pata_falcon: clarify license version and use SPDX header
pata_it821x: Delete an error message for a failed memory allocation in it821x_firmware_command()
pata_macio: Delete an error message for a failed memory allocation in two functions
pata_mpc52xx: Delete an error message for a failed memory allocation in mpc52xx_ata_probe()
sata_dwc_460ex: Delete an error message for a failed memory allocation in sata_dwc_port_start()
...
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 4582fa27cf37..2b16e7c8fff3 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -211,10 +211,10 @@ config AHCI_SUNXI If unsure, say N. config AHCI_TEGRA - tristate "NVIDIA Tegra124 AHCI SATA support" + tristate "NVIDIA Tegra AHCI SATA support" depends on ARCH_TEGRA help - This option enables support for the NVIDIA Tegra124 SoC's + This option enables support for the NVIDIA Tegra SoC's onboard AHCI SATA. If unsure, say N. @@ -954,6 +954,18 @@ config PATA_FALCON If unsure, say N. +config PATA_GAYLE + tristate "Amiga Gayle PATA support" + depends on M68K && AMIGA + help + This option enables support for the on-board IDE + interfaces on some Amiga models (A600, A1200, + A4000 and A4000T) and also for IDE interfaces on + the Zorro expansion bus (M-Tech E-Matrix 530 + expansion card). + + If unsure, say N. + config PATA_ISAPNP tristate "ISA Plug and Play PATA support" depends on ISAPNP |