diff options
author | Tony Lindgren <tony@atomide.com> | 2012-02-28 16:15:06 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 16:15:06 -0800 |
commit | 824e2dbb29eedb4afde9cb592a912f56038a5d1e (patch) | |
tree | 16831eceadb66c7fc661e387f81fc65c93742c1e /arch/arm/mach-omap2/board-ldp.c | |
parent | e9d69010996539b07caef1c9fa9a481e1df95e68 (diff) | |
parent | 9cf793f9b8b1ba9414e2a7591b2e911885f85a27 (diff) |
Merge branch 'hsmmc' into fixes-non-critical
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 2d2a61f7dcb..b5bc9b2e286 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -424,7 +424,7 @@ static void __init omap_ldp_init(void) board_nand_init(ldp_nand_partitions, ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0); - omap2_hsmmc_init(mmc); + omap_hsmmc_init(mmc); ldp_display_init(); } |