Merge branch 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / ata / Makefile

diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index cd096f0c78a105c2e9a9e605e0acdc3aed82af89..74298afbbaa7c354dd21fc9067a883f4326599e6 100644 (file)
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -66,4 +66,4 @@ obj-$(CONFIG_ATA_GENERIC)     += ata_generic.o
 obj-$(CONFIG_PATA_LEGACY)      += pata_legacy.o
 
 libata-objs    := libata-core.o libata-scsi.o libata-sff.o libata-eh.o
-
+libata-$(CONFIG_SATA_ACPI) += libata-acpi.o