diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-08-02 07:08:32 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-08-26 21:16:51 -0400 |
commit | 477f949e0ad7f1d3503a87b9f158d70c29abc918 (patch) | |
tree | f98f59928250cb2fd8367adbc8730080ac199e4e /arch/mips/sibyte | |
parent | 7acae224a423a492454d6550ce65c9af556d02c7 (diff) |
[MIPS] Sibyte: CONFIG_SIBYTE_SB1250_DUART -> CONFIG_SERIAL_SB1250_DUART
This is needed since the Sibyte serial driver was exchanged.
Issue report by Imre Kaloz <kaloz@openwrt.org>.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sibyte')
-rw-r--r-- | arch/mips/sibyte/bcm1480/irq.c | 4 | ||||
-rw-r--r-- | arch/mips/sibyte/cfe/console.c | 2 | ||||
-rw-r--r-- | arch/mips/sibyte/sb1250/irq.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c index ba0c4b776c85..79ae6ef979bb 100644 --- a/arch/mips/sibyte/bcm1480/irq.c +++ b/arch/mips/sibyte/bcm1480/irq.c | |||
@@ -76,7 +76,7 @@ __setup("nokgdb", nokgdb); | |||
76 | 76 | ||
77 | /* Default to UART1 */ | 77 | /* Default to UART1 */ |
78 | int kgdb_port = 1; | 78 | int kgdb_port = 1; |
79 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 79 | #ifdef CONFIG_SERIAL_SB1250_DUART |
80 | extern char sb1250_duart_present[]; | 80 | extern char sb1250_duart_present[]; |
81 | #endif | 81 | #endif |
82 | #endif | 82 | #endif |
@@ -404,7 +404,7 @@ void __init arch_init_irq(void) | |||
404 | if (kgdb_flag) { | 404 | if (kgdb_flag) { |
405 | kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port; | 405 | kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port; |
406 | 406 | ||
407 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 407 | #ifdef CONFIG_SERIAL_SB1250_DUART |
408 | sb1250_duart_present[kgdb_port] = 0; | 408 | sb1250_duart_present[kgdb_port] = 0; |
409 | #endif | 409 | #endif |
410 | /* Setup uart 1 settings, mapper */ | 410 | /* Setup uart 1 settings, mapper */ |
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c index c6ec748175b0..4cec9d798d2f 100644 --- a/arch/mips/sibyte/cfe/console.c +++ b/arch/mips/sibyte/cfe/console.c | |||
@@ -46,7 +46,7 @@ static int cfe_console_setup(struct console *cons, char *str) | |||
46 | /* XXXKW think about interaction with 'console=' cmdline arg */ | 46 | /* XXXKW think about interaction with 'console=' cmdline arg */ |
47 | /* If none of the console options are configured, the build will break. */ | 47 | /* If none of the console options are configured, the build will break. */ |
48 | if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) { | 48 | if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) { |
49 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 49 | #ifdef CONFIG_SERIAL_SB1250_DUART |
50 | if (!strcmp(consdev, "uart0")) { | 50 | if (!strcmp(consdev, "uart0")) { |
51 | setleds("u0cn"); | 51 | setleds("u0cn"); |
52 | } else if (!strcmp(consdev, "uart1")) { | 52 | } else if (!strcmp(consdev, "uart1")) { |
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 */ |