diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-28 00:21:44 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-28 00:24:03 -0400 |
commit | 1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544 (patch) | |
tree | 41ea81fdecc67d766789ea3e46b1a49773dc8ec4 /arch/arm/mach-omap2/board-rm680.c | |
parent | 4788d72ce6c0d71220c06a242f935a056eccf424 (diff) | |
parent | 489e7bece7f6859a7df484a4dce08fa51fb0d876 (diff) |
Merge branch 'fixes-non-critical' into next/drivers2
fixes-non-critical has already been merged upstream, and there are a
handful of annoying context conflicts that it makes sense to resolve
before sending up. Part of this is because there was parallel development
going on between more urgent fixes and general driver fixups, it should
settle down once the lpc32xx platform reaches a more steady state.
Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-lpc32xx/common.h
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/board-rm680.c')
-rw-r--r-- | arch/arm/mach-omap2/board-rm680.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c index 8678b386c6a2..2d24c98f3d45 100644 --- a/arch/arm/mach-omap2/board-rm680.c +++ b/arch/arm/mach-omap2/board-rm680.c | |||
@@ -120,7 +120,7 @@ static void __init rm680_peripherals_init(void) | |||
120 | ARRAY_SIZE(rm680_peripherals_devices)); | 120 | ARRAY_SIZE(rm680_peripherals_devices)); |
121 | rm680_i2c_init(); | 121 | rm680_i2c_init(); |
122 | gpmc_onenand_init(board_onenand_data); | 122 | gpmc_onenand_init(board_onenand_data); |
123 | omap2_hsmmc_init(mmc); | 123 | omap_hsmmc_init(mmc); |
124 | } | 124 | } |
125 | 125 | ||
126 | #ifdef CONFIG_OMAP_MUX | 126 | #ifdef CONFIG_OMAP_MUX |