diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:10:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:10:25 -0400 |
| commit | f165eb77f49cb6f6e86e2f2f09183904b2965d19 (patch) | |
| tree | db166579758930f52a1a625eb872bd96bd7ff88e /drivers/ata/Makefile | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
| parent | a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmtreo.c
Diffstat (limited to 'drivers/ata/Makefile')
| -rw-r--r-- | drivers/ata/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 7ef89d73df6..e87d644b8ed 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile | |||
| @@ -89,6 +89,8 @@ obj-$(CONFIG_PATA_RB532) += pata_rb532_cf.o | |||
| 89 | obj-$(CONFIG_PATA_RZ1000) += pata_rz1000.o | 89 | obj-$(CONFIG_PATA_RZ1000) += pata_rz1000.o |
| 90 | obj-$(CONFIG_PATA_WINBOND_VLB) += pata_winbond.o | 90 | obj-$(CONFIG_PATA_WINBOND_VLB) += pata_winbond.o |
| 91 | 91 | ||
| 92 | obj-$(CONFIG_PATA_PXA) += pata_pxa.o | ||
| 93 | |||
| 92 | # Should be last but two libata driver | 94 | # Should be last but two libata driver |
| 93 | obj-$(CONFIG_PATA_ACPI) += pata_acpi.o | 95 | obj-$(CONFIG_PATA_ACPI) += pata_acpi.o |
| 94 | # Should be last but one libata driver | 96 | # Should be last but one libata driver |