diff options
| author | Kevin Hilman | 2010-10-01 22:24:10 +0200 |
|---|---|---|
| committer | Kevin Hilman | 2010-10-01 22:24:10 +0200 |
| commit | 69758ab7a1e2de5636a2188d5357dd03140bf1d8 (patch) | |
| tree | 13d65cbee4cc6bfed697bd164a15529ad86c2b25 /arch/arm/mach-omap2/board-zoom-peripherals.c | |
| parent | Merge branch 'pm-hwmod-wdog' into pm-hwmods (diff) | |
| parent | OMAP3: SERIAL: Initialize all omap-uarts for zoom boards (diff) | |
| download | kernel-qcow2-linux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.tar.gz kernel-qcow2-linux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.tar.xz kernel-qcow2-linux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.zip | |
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 e5eac46bbac9..35066b355bd5 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) omap_i2c_init(); usb_musb_init(&musb_board_data); enable_board_wakeup_source(); + omap_serial_init(); } |