git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
[pandora-kernel.git]
/
arch
/
avr32
/
boards
/
atstk1000
/
atstk1002.c
diff --git
a/arch/avr32/boards/atstk1000/atstk1002.c
b/arch/avr32/boards/atstk1000/atstk1002.c
index
1f33a10
..
2adc261
100644
(file)
--- a/
arch/avr32/boards/atstk1000/atstk1002.c
+++ b/
arch/avr32/boards/atstk1000/atstk1002.c
@@
-252,12
+252,12
@@
static void __init atstk1002_setup_extdac(void)
void __init setup_board(void)
{
#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
void __init setup_board(void)
{
#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
- at32_map_usart(0, 1
);
/* USART 0/B: /dev/ttyS1, IRDA */
+ at32_map_usart(0, 1
, 0);
/* USART 0/B: /dev/ttyS1, IRDA */
#else
#else
- at32_map_usart(1, 0
);
/* USART 1/A: /dev/ttyS0, DB9 */
+ at32_map_usart(1, 0
, 0);
/* USART 1/A: /dev/ttyS0, DB9 */
#endif
/* USART 2/unused: expansion connector */
#endif
/* USART 2/unused: expansion connector */
- at32_map_usart(3, 2
);
/* USART 3/C: /dev/ttyS2, DB9 */
+ at32_map_usart(3, 2
, 0);
/* USART 3/C: /dev/ttyS2, DB9 */
at32_setup_serial_console(0);
}
at32_setup_serial_console(0);
}