diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 07:45:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 07:45:59 -0400 |
| commit | 91d0322bef047e2916b3e52741411bffc63929cb (patch) | |
| tree | 44c4fd13cc17755a6db8a3d70cffb86e57a838dc /arch/arm/mach-at91/board-csb637.c | |
| parent | 065cb3dfe24978651caedfa54da585388ad15dde (diff) | |
| parent | 50515af207d410c9f228380e529c56f43c3de0bd (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/arm/mach-at91/board-csb637.c')
| -rw-r--r-- | arch/arm/mach-at91/board-csb637.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c index 419fd19b620b..bb1a5474ddab 100644 --- a/arch/arm/mach-at91/board-csb637.c +++ b/arch/arm/mach-at91/board-csb637.c | |||
| @@ -45,10 +45,10 @@ static void __init csb637_map_io(void) | |||
| 45 | /* Initialize processor: 3.6864 MHz crystal */ | 45 | /* Initialize processor: 3.6864 MHz crystal */ |
| 46 | at91rm9200_initialize(3686400, AT91RM9200_BGA); | 46 | at91rm9200_initialize(3686400, AT91RM9200_BGA); |
| 47 | 47 | ||
| 48 | /* DBGU on ttyS0 */ | 48 | /* DBGU on ttyS0. (Rx & Tx only) */ |
| 49 | at91_register_uart(0, 0, 0); | 49 | at91_register_uart(0, 0, 0); |
| 50 | 50 | ||
| 51 | /* make console=ttyS0 the default */ | 51 | /* make console=ttyS0 (ie, DBGU) the default */ |
| 52 | at91_set_serial_console(0); | 52 | at91_set_serial_console(0); |
| 53 | } | 53 | } |
| 54 | 54 | ||