diff --git a/[refs] b/[refs] index c2add33075f0..e03a31f6fa86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cca3974e48607c3775dc73b544a5700b2e37c21a +refs/heads/master: e889173c2c67dc288e9b050ab066cfae151b047e diff --git a/trunk/drivers/ata/Makefile b/trunk/drivers/ata/Makefile index c17ae9c8b91d..e260e3fe65c8 100644 --- a/trunk/drivers/ata/Makefile +++ b/trunk/drivers/ata/Makefile @@ -17,5 +17,5 @@ obj-$(CONFIG_SATA_ULI) += sata_uli.o obj-$(CONFIG_SATA_MV) += sata_mv.o obj-$(CONFIG_PDC_ADMA) += pdc_adma.o -libata-objs := libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o +libata-objs := libata-core.o libata-scsi.o libata-sff.o libata-eh.o diff --git a/trunk/drivers/ata/libata-bmdma.c b/trunk/drivers/ata/libata-sff.c similarity index 100% rename from trunk/drivers/ata/libata-bmdma.c rename to trunk/drivers/ata/libata-sff.c