diff --git a/[refs] b/[refs]
index 2f501749d805..a8aa0d02e845 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab7edb149c7548541ee588b8372c2041b6f1cbc8
+refs/heads/master: 210afeecd41b97db8ad096a778243cdcec9f1189
diff --git a/trunk/drivers/mfd/Makefile b/trunk/drivers/mfd/Makefile
index 05bebf66ccd2..8a68fc7ea870 100644
--- a/trunk/drivers/mfd/Makefile
+++ b/trunk/drivers/mfd/Makefile
@@ -67,7 +67,7 @@ obj-$(CONFIG_TWL4030_CORE)	+= twl-core.o twl4030-irq.o twl6030-irq.o
 obj-$(CONFIG_TWL4030_MADC)      += twl4030-madc.o
 obj-$(CONFIG_TWL4030_POWER)    += twl4030-power.o
 obj-$(CONFIG_MFD_TWL4030_AUDIO)	+= twl4030-audio.o
-obj-$(CONFIG_TWL6040_CORE)	+= twl6040-core.o
+obj-$(CONFIG_TWL6040_CORE)	+= twl6040.o
 
 obj-$(CONFIG_MFD_MC13XXX)	+= mc13xxx-core.o
 obj-$(CONFIG_MFD_MC13XXX_SPI)	+= mc13xxx-spi.o
diff --git a/trunk/drivers/mfd/twl6040-core.c b/trunk/drivers/mfd/twl6040.c
similarity index 100%
rename from trunk/drivers/mfd/twl6040-core.c
rename to trunk/drivers/mfd/twl6040.c