diff options
| author | Kevin Hilman <khilman@ti.com> | 2012-03-06 00:37:04 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2012-03-06 00:37:04 +0100 |
| commit | 015f1e4297ad32f83251f3f4cee2389ce5516e9e (patch) | |
| tree | 1b16e317005dc3d09b0551a4db9182f7f4119f71 /arch/arm/mach-omap2/board-rx51-peripherals.c | |
| parent | ARM: OMAP2+: Fix L4_EMU_34XX_BASE error after iomap changes (diff) | |
| parent | ARM: OMAP: convert omap_device_build() and callers to __init (diff) | |
| download | linux-015f1e4297ad32f83251f3f4cee2389ce5516e9e.tar.xz linux-015f1e4297ad32f83251f3f4cee2389ce5516e9e.zip | |
Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 0a668916e3c1..0f65c3b202ac 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -1142,7 +1142,7 @@ void __init rx51_peripherals_init(void) partition = omap_mux_get("core"); if (partition) - omap2_hsmmc_init(mmc); + omap_hsmmc_init(mmc); rx51_charger_init(); } |