Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

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

diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 701651e37c89910f7b7b22e3cc0ae0c4b389f2ff..b693d829383a3b7ff9e33bd0d181523f23297379 100644 (file)
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_PATA_PDC2027X)   += pata_pdc2027x.o
 obj-$(CONFIG_PATA_PDC_OLD)     += pata_pdc202xx_old.o
 obj-$(CONFIG_PATA_QDI)         += pata_qdi.o
 obj-$(CONFIG_PATA_RADISYS)     += pata_radisys.o
+obj-$(CONFIG_PATA_RB532)       += pata_rb532_cf.o
 obj-$(CONFIG_PATA_RZ1000)      += pata_rz1000.o
 obj-$(CONFIG_PATA_SC1200)      += pata_sc1200.o
 obj-$(CONFIG_PATA_SERVERWORKS) += pata_serverworks.o
@@ -77,6 +78,7 @@ obj-$(CONFIG_ATA_GENERIC)     += ata_generic.o
 # Should be last libata driver
 obj-$(CONFIG_PATA_LEGACY)      += pata_legacy.o
 
-libata-objs    := libata-core.o libata-scsi.o libata-sff.o libata-eh.o \
-                  libata-pmp.o
+libata-objs    := libata-core.o libata-scsi.o libata-eh.o
+libata-$(CONFIG_ATA_SFF)       += libata-sff.o
+libata-$(CONFIG_SATA_PMP)      += libata-pmp.o
 libata-$(CONFIG_ATA_ACPI)      += libata-acpi.o