diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /arch/mips/sibyte/sb1250/irq.c | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/mips/sibyte/sb1250/irq.c')
| -rw-r--r-- | arch/mips/sibyte/sb1250/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c index 0e6a13c0bd0e..ad593a6c20be 100644 --- a/arch/mips/sibyte/sb1250/irq.c +++ b/arch/mips/sibyte/sb1250/irq.c | |||
| @@ -61,7 +61,7 @@ static int kgdb_irq; | |||
| 61 | 61 | ||
| 62 | /* Default to UART1 */ | 62 | /* Default to UART1 */ |
| 63 | int kgdb_port = 1; | 63 | int kgdb_port = 1; |
| 64 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 64 | #ifdef CONFIG_SERIAL_SB1250_DUART |
| 65 | extern char sb1250_duart_present[]; | 65 | extern char sb1250_duart_present[]; |
| 66 | #endif | 66 | #endif |
| 67 | #endif | 67 | #endif |
| @@ -359,7 +359,7 @@ void __init arch_init_irq(void) | |||
| 359 | if (kgdb_flag) { | 359 | if (kgdb_flag) { |
| 360 | kgdb_irq = K_INT_UART_0 + kgdb_port; | 360 | kgdb_irq = K_INT_UART_0 + kgdb_port; |
| 361 | 361 | ||
| 362 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 362 | #ifdef CONFIG_SERIAL_SB1250_DUART |
| 363 | sb1250_duart_present[kgdb_port] = 0; | 363 | sb1250_duart_present[kgdb_port] = 0; |
| 364 | #endif | 364 | #endif |
| 365 | /* Setup uart 1 settings, mapper */ | 365 | /* Setup uart 1 settings, mapper */ |