summaryrefslogtreecommitdiff
path: root/drivers/ata/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-08-10 23:17:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-10 23:17:52 +0100
commit0b019a41553a919965bb02d07d54e3e6c57a796d (patch)
tree6e329b4159b440d2aac5200a5c07103fe261c096 /drivers/ata/Makefile
parent5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff)
parent054d5c9238f3c577ad51195c3ee7803613f322cc (diff)
downloadlinux-3.10-0b019a41553a919965bb02d07d54e3e6c57a796d.tar.gz
linux-3.10-0b019a41553a919965bb02d07d54e3e6c57a796d.tar.bz2
linux-3.10-0b019a41553a919965bb02d07d54e3e6c57a796d.zip
Merge branches 'master' and 'devel' into for-linus
Conflicts: arch/arm/Kconfig arch/arm/mm/Kconfig
Diffstat (limited to 'drivers/ata/Makefile')
-rw-r--r--drivers/ata/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 6540632bda0..158eaa961b1 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -91,6 +91,8 @@ obj-$(CONFIG_PATA_RZ1000) += pata_rz1000.o
obj-$(CONFIG_PATA_SAMSUNG_CF) += pata_samsung_cf.o
obj-$(CONFIG_PATA_WINBOND_VLB) += pata_winbond.o
+obj-$(CONFIG_PATA_PXA) += pata_pxa.o
+
# Should be last but two libata driver
obj-$(CONFIG_PATA_ACPI) += pata_acpi.o
# Should be last but one libata driver