diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-14 09:29:52 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-14 09:29:52 -0400 |
| commit | 23e117fa44429cc054cb27d5621d64e4ced91e52 (patch) | |
| tree | a4b9d0902b9c6f009b2c297515221c1b9bed3af8 /arch/arm/mach-omap2/board-3630sdp.c | |
| parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
| parent | a93d2f1744206827ccf416e2cdc5018aa503314e (diff) | |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4
Diffstat (limited to 'arch/arm/mach-omap2/board-3630sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-3630sdp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index a0a2a113465c..504d2bd222fe 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c | |||
| @@ -96,6 +96,7 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
| 96 | static void __init omap_sdp_init(void) | 96 | static void __init omap_sdp_init(void) |
| 97 | { | 97 | { |
| 98 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); | 98 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); |
| 99 | omap_serial_init(); | ||
| 99 | zoom_peripherals_init(); | 100 | zoom_peripherals_init(); |
| 100 | board_smc91x_init(); | 101 | board_smc91x_init(); |
| 101 | enable_board_wakeup_source(); | 102 | enable_board_wakeup_source(); |