diff --git a/[refs] b/[refs] index 4e35e67a40d9..5205fdeef707 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ad601955315b010a117306b994f2204fae85fdc +refs/heads/master: 4b1be934110cee3ad8d3f813f1a5bf28a56ca691 diff --git a/trunk/drivers/ata/Makefile b/trunk/drivers/ata/Makefile index ccd461bb5ee4..c501af5b12b9 100644 --- a/trunk/drivers/ata/Makefile +++ b/trunk/drivers/ata/Makefile @@ -99,7 +99,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-eh.o libata-transport.o +libata-y := libata-core.o libata-scsi.o libata-eh.o libata-transport.o libata-$(CONFIG_ATA_SFF) += libata-sff.o libata-$(CONFIG_SATA_PMP) += libata-pmp.o libata-$(CONFIG_ATA_ACPI) += libata-acpi.o