Index: head/sys/arm/ti/am335x/files.am335x
===================================================================
--- head/sys/arm/ti/am335x/files.am335x	(revision 273054)
+++ head/sys/arm/ti/am335x/files.am335x	(revision 273055)
@@ -1,16 +1,15 @@
 #$FreeBSD$
 
 arm/ti/aintc.c				standard
 
 arm/ti/am335x/am335x_dmtimer.c		standard
 arm/ti/am335x/am335x_lcd.c		optional	sc
 arm/ti/am335x/am335x_lcd_syscons.c	optional	sc
 arm/ti/am335x/am335x_pmic.c		optional	am335x_pmic
 arm/ti/am335x/am335x_prcm.c		standard
 arm/ti/am335x/am335x_pwm.c		standard
 arm/ti/am335x/am335x_scm_padconf.c	standard
 arm/ti/am335x/am335x_usbss.c		optional	musb fdt
 
 arm/ti/ti_edma3.c			standard
-arm/ti/ti_sdhci.c 			optional	sdhci
 arm/ti/cpsw/if_cpsw.c			optional	cpsw
Index: head/sys/arm/ti/files.ti
===================================================================
--- head/sys/arm/ti/files.ti	(revision 273054)
+++ head/sys/arm/ti/files.ti	(revision 273055)
@@ -1,28 +1,29 @@
 #$FreeBSD$
 
 kern/kern_clocksource.c				standard
 
 arm/arm/bus_space-v6.c				standard
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
 arm/arm/cpufunc_asm_armv5.S			standard
 arm/arm/cpufunc_asm_arm10.S			standard
 arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 
 arm/ti/ti_common.c				standard
 arm/ti/ti_cpuid.c				standard
 arm/ti/ti_machdep.c				standard
 arm/ti/ti_prcm.c				standard
 arm/ti/ti_scm.c					standard
 dev/mbox/mbox_if.m				standard
 arm/ti/ti_mbox.c				standard
 arm/ti/ti_pruss.c				standard
 
 arm/ti/ti_adc.c					optional	ti_adc
 arm/ti/ti_gpio.c				optional	gpio
 arm/ti/ti_i2c.c					optional	ti_i2c
+arm/ti/ti_sdhci.c	 			optional	sdhci
 
 dev/uart/uart_dev_ti8250.c			optional	uart
 dev/uart/uart_dev_ns8250.c			optional	uart
 
Index: head/sys/arm/ti/omap4/files.omap4
===================================================================
--- head/sys/arm/ti/omap4/files.omap4	(revision 273054)
+++ head/sys/arm/ti/omap4/files.omap4	(revision 273055)
@@ -1,19 +1,18 @@
 #$FreeBSD$
 
 arm/arm/gic.c					standard
 arm/arm/mpcore_timer.c				standard
 arm/ti/ti_smc.S					standard
 
 arm/ti/usb/omap_ehci.c				optional	usb ehci
 arm/ti/ti_sdma.c				optional	ti_sdma
-arm/ti/ti_sdhci.c 				optional	sdhci
 
 arm/ti/omap4/omap4_l2cache.c			optional	pl310
 arm/ti/omap4/omap4_prcm_clks.c			standard
 arm/ti/omap4/omap4_scm_padconf.c		standard
 arm/ti/omap4/omap4_mp.c				optional	smp
 
 arm/ti/twl/twl.c				optional	twl
 arm/ti/twl/twl_vreg.c				optional	twl twl_vreg
 arm/ti/twl/twl_clks.c				optional	twl twl_clks