From a17564b5c78d168dd5621b96758e1376bdfb72c7 Mon Sep 17 00:00:00 2001 From: "Govindraj.R" Date: Mon, 27 Sep 2010 20:21:05 +0530 Subject: [PATCH] --- yaml --- r: 216982 b: refs/heads/master c: 257f23d87f9309fee41d468575404b9371bf4c7d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-3630sdp.c | 1 - trunk/arch/arm/mach-omap2/board-zoom-peripherals.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7f241fcf2edd..22414f2aee4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12a75da296d43784c960a2beaca002a08d06cf15 +refs/heads/master: 257f23d87f9309fee41d468575404b9371bf4c7d diff --git a/trunk/arch/arm/mach-omap2/board-3630sdp.c b/trunk/arch/arm/mach-omap2/board-3630sdp.c index b359c3f7bb39..d5104519ab03 100644 --- a/trunk/arch/arm/mach-omap2/board-3630sdp.c +++ b/trunk/arch/arm/mach-omap2/board-3630sdp.c @@ -208,7 +208,6 @@ static struct flash_partitions sdp_flash_partitions[] = { static void __init omap_sdp_init(void) { omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); - omap_serial_init(); zoom_peripherals_init(); board_smc91x_init(); board_flash_init(sdp_flash_partitions, chip_sel_sdp); diff --git a/trunk/arch/arm/mach-omap2/board-zoom-peripherals.c b/trunk/arch/arm/mach-omap2/board-zoom-peripherals.c index e5eac46bbac9..35066b355bd5 100644 --- a/trunk/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/trunk/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(); }