diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 02:16:22 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 02:16:22 -0500 |
commit | 838632438145ac6863377eb12d8b8eef9c55d288 (patch) | |
tree | fbb0757df837f3c75a99c518a3596c38daef162d /arch/arm/mach-omap1/board-palmte.c | |
parent | 9996508b3353063f2d6c48c1a28a84543d72d70b (diff) | |
parent | 29e553631b2a0d4eebd23db630572e1027a9967a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-omap1/board-palmte.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 90dd0431b0dc..4de258420f39 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -342,6 +342,14 @@ static void __init palmte_misc_gpio_setup(void) | |||
342 | 342 | ||
343 | static void __init omap_palmte_init(void) | 343 | static void __init omap_palmte_init(void) |
344 | { | 344 | { |
345 | /* mux pins for uarts */ | ||
346 | omap_cfg_reg(UART1_TX); | ||
347 | omap_cfg_reg(UART1_RTS); | ||
348 | omap_cfg_reg(UART2_TX); | ||
349 | omap_cfg_reg(UART2_RTS); | ||
350 | omap_cfg_reg(UART3_TX); | ||
351 | omap_cfg_reg(UART3_RX); | ||
352 | |||
345 | omap_board_config = palmte_config; | 353 | omap_board_config = palmte_config; |
346 | omap_board_config_size = ARRAY_SIZE(palmte_config); | 354 | omap_board_config_size = ARRAY_SIZE(palmte_config); |
347 | 355 | ||