diff options
| author | Kevin Hilman <khilman@ti.com> | 2012-03-05 18:37:04 -0500 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2012-03-05 18:37:04 -0500 |
| commit | 015f1e4297ad32f83251f3f4cee2389ce5516e9e (patch) | |
| tree | 1b16e317005dc3d09b0551a4db9182f7f4119f71 /arch/arm/mach-omap2/board-rx51-peripherals.c | |
| parent | 1b35af54ee9cbbdd13fed53fd4acb0952ba522e1 (diff) | |
| parent | 9cf793f9b8b1ba9414e2a7591b2e911885f85a27 (diff) | |
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) | |||
| 1142 | 1142 | ||
| 1143 | partition = omap_mux_get("core"); | 1143 | partition = omap_mux_get("core"); |
| 1144 | if (partition) | 1144 | if (partition) |
| 1145 | omap2_hsmmc_init(mmc); | 1145 | omap_hsmmc_init(mmc); |
| 1146 | 1146 | ||
| 1147 | rx51_charger_init(); | 1147 | rx51_charger_init(); |
| 1148 | } | 1148 | } |