diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 20:54:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 20:54:49 -0700 |
| commit | ca9a702e50287cf429f1c12832319a26a715e70b (patch) | |
| tree | a29c7c68d2945c47d058b42ecd4475fed5c19fe2 /drivers/ata/Makefile | |
| parent | bbe5a96f678efcad83de8f900ab4ab963a99c805 (diff) | |
| parent | d15d6e6cc340566d53d953ffdec2c9e96816fa52 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers
pata_amd: do not filter out valid modes in nv_mode_filter
sata_promise: update reset code
sata_promise: disable hotplug on 1st gen chips
libata: fix spurious WARN_ON_ONCE() on port freeze
ahci: restore pci_intx() handling
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 463eb52236a..01e126f343b 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_SATA_FSL) += sata_fsl.o obj-$(CONFIG_PATA_ALI) += pata_ali.o obj-$(CONFIG_PATA_AMD) += pata_amd.o obj-$(CONFIG_PATA_ARTOP) += pata_artop.o +obj-$(CONFIG_PATA_ATP867X) += pata_atp867x.o obj-$(CONFIG_PATA_AT32) += pata_at32.o obj-$(CONFIG_PATA_ATIIXP) += pata_atiixp.o obj-$(CONFIG_PATA_CMD640_PCI) += pata_cmd640.o |