summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-3630sdp.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-10-08 10:20:40 -0700
committerTony Lindgren <tony@atomide.com>2010-10-08 10:20:40 -0700
commitbc3caae8a191c712d8ae666d0b8d18807bfe2b14 (patch)
tree7b338ebba2f1fdbcee3785789bf9f4a74d93aa94 /arch/arm/mach-omap2/board-3630sdp.c
parent73c5ef126f40b0b872e5964ff65dbe792eeec493 (diff)
parent69758ab7a1e2de5636a2188d5357dd03140bf1d8 (diff)
downloadop-kernel-dev-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.zip
op-kernel-dev-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.tar.gz
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-3630sdp.c')
-rw-r--r--arch/arm/mach-omap2/board-3630sdp.c1
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 2b2e0ef..3ef092f 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);
OpenPOWER on IntegriCloud