diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-08 19:20:40 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 19:20:40 +0200 |
| commit | bc3caae8a191c712d8ae666d0b8d18807bfe2b14 (patch) | |
| tree | 7b338ebba2f1fdbcee3785789bf9f4a74d93aa94 /arch/arm/mach-omap2/board-zoom-peripherals.c | |
| parent | Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus (diff) | |
| parent | manual merge for pm-hwmod-uart due to conflicts (diff) | |
| download | linux-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.tar.xz linux-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.zip | |
Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
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 073fd9b4c36d..239c1f0eb940 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -285,4 +285,5 @@ void __init zoom_peripherals_init(void) omap_i2c_init(); usb_musb_init(&musb_board_data); enable_board_wakeup_source(); + omap_serial_init(); } |