diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 11:16:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 11:16:42 -0400 |
| commit | 0b3dc0e9c8ed4f09605fa844081503bf752388b0 (patch) | |
| tree | b6863e3ee9659392f12df909296f882c6b4129c5 /arch/arm/mach-omap2/io.c | |
| parent | 59f4122778efd931d17c9a9ef93b3b47d55e8a32 (diff) | |
| parent | 54341c9b741dc5646842fe47eccfc3b506c6dafa (diff) | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
omap4: Fix UART4 platform data on omap4
omap4: Allow omap_serial_early_init() for OMAP4430 board
omap3: PM: enable UART3 module wakeups
omap2: Fix console serial port number for n8x0
omap2: Fix detection of n8x0
omap1: Fix DSP public peripherals support for ams-delta
omap1: Fix redundant UARTs pin muxing that can break other hardware support
omap: iommu: fix wrong condition check for SUPERSECTION
omap: SDMA: Fix omap_stop_dma() API for channel linking
omap: Fix omap-keypad by restoring old keypad.h without breaking omap2 boards that use matrix_keypad
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index e3a3bad1d84f..56be87d13edb 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -302,7 +302,9 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, | |||
| 302 | pwrdm_init(powerdomains_omap); | 302 | pwrdm_init(powerdomains_omap); |
| 303 | clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); | 303 | clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); |
| 304 | omap2_clk_init(); | 304 | omap2_clk_init(); |
| 305 | #endif | ||
| 305 | omap_serial_early_init(); | 306 | omap_serial_early_init(); |
| 307 | #ifndef CONFIG_ARCH_OMAP4 | ||
| 306 | omap_hwmod_late_init(); | 308 | omap_hwmod_late_init(); |
| 307 | omap_pm_if_init(); | 309 | omap_pm_if_init(); |
| 308 | omap2_sdrc_init(sdrc_cs0, sdrc_cs1); | 310 | omap2_sdrc_init(sdrc_cs0, sdrc_cs1); |