obj-$(CONFIG_MACH_OMAP_H4)             += board-h4.o board-h4-mmc.o
 obj-$(CONFIG_MACH_OMAP_2430SDP)                += board-2430sdp.o \
                                           board-2430sdp-flash.o \
-                                          hsmmc.o \
+                                          mmc-twl4030.o \
                                           usb-musb.o \
                                           usb-ehci.o
 obj-$(CONFIG_MACH_OMAP2EVM)            += board-omap2evm.o \
-                                          hsmmc.o
+                                          mmc-twl4030.o
 obj-$(CONFIG_MACH_OMAP_3430SDP)                += board-3430sdp.o \
-                                          hsmmc.o \
+                                          mmc-twl4030.o \
                                           usb-musb.o \
                                           usb-ehci.o \
                                           board-3430sdp-flash.o
 obj-$(CONFIG_MACH_OMAP3EVM)            += board-omap3evm.o \
-                                          hsmmc.o \
+                                          mmc-twl4030.o \
                                           usb-musb.o usb-ehci.o \
                                           board-omap3evm-flash.o \
                                           twl4030-generic-scripts.o
 obj-$(CONFIG_MACH_OMAP3_BEAGLE)                += board-omap3beagle.o \
                                           usb-musb.o usb-ehci.o \
-                                          hsmmc.o \
+                                          mmc-twl4030.o \
                                           twl4030-generic-scripts.o
 obj-$(CONFIG_MACH_OMAP_LDP)            += board-ldp.o \
-                                          hsmmc.o \
+                                          mmc-twl4030.o \
                                           usb-musb.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)                += board-apollon.o \
                                           board-apollon-mmc.o  \
                                           board-n800-camera.o
 obj-$(CONFIG_MACH_NOKIA_N810)          += board-n810.o
 obj-$(CONFIG_MACH_OVERO)               += board-overo.o \
-                                          hsmmc.o \
+                                          mmc-twl4030.o \
                                           usb-musb.o \
                                           usb-ehci.o \
                                           twl4030-generic-scripts.o
 obj-$(CONFIG_MACH_OMAP3_PANDORA)       += board-omap3pandora.o \
-                                          hsmmc.o \
+                                          mmc-twl4030.o \
                                           usb-musb.o \
                                           usb-ehci.o
 
 
 /*
- * linux/arch/arm/mach-omap2/hsmmc.c
+ * linux/arch/arm/mach-omap2/mmc-twl4030.c
  *
  * Copyright (C) 2007-2008 Texas Instruments
  * Copyright (C) 2008 Nokia Corporation