diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-03 17:42:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-03 17:42:25 -0700 |
| commit | a23867f1d2de572f84b459651dfe99fa9e79fadf (patch) | |
| tree | ae3cecc903408653646986aa03b5361ef5ae1204 /drivers/ata/Makefile | |
| parent | ef1c4a6fa91bbbe9b09f770d28eba31a9edf770c (diff) | |
| parent | 027fa4dee935d25cef5994af1b8864eb00dcffac (diff) | |
| download | linux-a23867f1d2de572f84b459651dfe99fa9e79fadf.tar.bz2 | |
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/Makefile')
| -rw-r--r-- | drivers/ata/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 6dae8c985e8e..d21cdd83f7ab 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -97,6 +97,7 @@ obj-$(CONFIG_PATA_WINBOND) += pata_sl82c105.o # SFF PIO only obj-$(CONFIG_PATA_CMD640_PCI) += pata_cmd640.o obj-$(CONFIG_PATA_FALCON) += pata_falcon.o +obj-$(CONFIG_PATA_GAYLE) += pata_gayle.o obj-$(CONFIG_PATA_ISAPNP) += pata_isapnp.o obj-$(CONFIG_PATA_IXP4XX_CF) += pata_ixp4xx_cf.o obj-$(CONFIG_PATA_MPIIX) += pata_mpiix.o |