diff --git a/[refs] b/[refs]
index b776cdfce925..a737a2dbdbf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c77380d4534c65cc9865a6b4efea44be4d039207
+refs/heads/master: fa3fd7204e1a4e8538117f0edbfecd4132276860
diff --git a/trunk/drivers/ide/Makefile b/trunk/drivers/ide/Makefile
index 3384e47c28ec..7818d402b188 100644
--- a/trunk/drivers/ide/Makefile
+++ b/trunk/drivers/ide/Makefile
@@ -68,7 +68,6 @@ obj-$(CONFIG_BLK_DEV_VIA82CXXX)		+= via82cxxx.o
 
 # Must appear at the end of the block
 obj-$(CONFIG_BLK_DEV_GENERIC)		+= ide-pci-generic.o
-ide-pci-generic-y			+= generic.o
 
 obj-$(CONFIG_IDEPCI_PCIBUS_ORDER)	+= ide-scan-pci.o
 
diff --git a/trunk/drivers/ide/generic.c b/trunk/drivers/ide/ide-pci-generic.c
similarity index 100%
rename from trunk/drivers/ide/generic.c
rename to trunk/drivers/ide/ide-pci-generic.c