diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-01 13:24:10 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-01 13:24:10 -0700 |
| commit | 69758ab7a1e2de5636a2188d5357dd03140bf1d8 (patch) | |
| tree | 13d65cbee4cc6bfed697bd164a15529ad86c2b25 /arch/arm/mach-omap2/board-3630sdp.c | |
| parent | 963bfb0939232e415c7bfb19b08dce300eb148d9 (diff) | |
| parent | 257f23d87f9309fee41d468575404b9371bf4c7d (diff) | |
| download | linux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.tar.gz linux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.tar.bz2 linux-69758ab7a1e2de5636a2188d5357dd03140bf1d8.zip | |
manual merge for pm-hwmod-uart due to conflicts
Diffstat (limited to 'arch/arm/mach-omap2/board-3630sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-3630sdp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index b359c3f7bb39..d5104519ab03 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/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); |