diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-01 16:24:10 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-01 16:24:10 -0400 |
| commit | 69758ab7a1e2de5636a2188d5357dd03140bf1d8 (patch) | |
| tree | 13d65cbee4cc6bfed697bd164a15529ad86c2b25 /arch/arm/mach-omap2/board-zoom-peripherals.c | |
| parent | 963bfb0939232e415c7bfb19b08dce300eb148d9 (diff) | |
| parent | 257f23d87f9309fee41d468575404b9371bf4c7d (diff) | |
manual merge for pm-hwmod-uart due to conflicts
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom-peripherals.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index e5eac46bbac..35066b355bd 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
| @@ -283,4 +283,5 @@ void __init zoom_peripherals_init(void) | |||
| 283 | omap_i2c_init(); | 283 | omap_i2c_init(); |
| 284 | usb_musb_init(&musb_board_data); | 284 | usb_musb_init(&musb_board_data); |
| 285 | enable_board_wakeup_source(); | 285 | enable_board_wakeup_source(); |
| 286 | omap_serial_init(); | ||
| 286 | } | 287 | } |