diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-08 13:20:40 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 13:20:40 -0400 |
| commit | bc3caae8a191c712d8ae666d0b8d18807bfe2b14 (patch) | |
| tree | 7b338ebba2f1fdbcee3785789bf9f4a74d93aa94 /arch/arm/mach-omap2/board-3630sdp.c | |
| parent | 73c5ef126f40b0b872e5964ff65dbe792eeec493 (diff) | |
| parent | 69758ab7a1e2de5636a2188d5357dd03140bf1d8 (diff) | |
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.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 2b2e0efd557..3ef092f839c 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[] = { | |||
| 208 | static void __init omap_sdp_init(void) | 208 | static void __init omap_sdp_init(void) |
| 209 | { | 209 | { |
| 210 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); | 210 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); |
| 211 | omap_serial_init(); | ||
| 212 | zoom_peripherals_init(); | 211 | zoom_peripherals_init(); |
| 213 | board_smc91x_init(); | 212 | board_smc91x_init(); |
| 214 | board_flash_init(sdp_flash_partitions, chip_sel_sdp); | 213 | board_flash_init(sdp_flash_partitions, chip_sel_sdp); |