diff options
| author | Steven Whitehouse <steve@men-an-tol.chygwyn.com> | 2006-02-23 04:49:43 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-23 04:49:43 -0500 |
| commit | d35462b4bb847b68321c55e95c926aa485aecce2 (patch) | |
| tree | b08e18bf6e672633402871ee763102fdb5e63229 /arch/mips/momentum/jaguar_atx/ja-console.c | |
| parent | 91ffd7db71e7451f89941a8f428b4daa2a7c1e38 (diff) | |
| parent | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/momentum/jaguar_atx/ja-console.c')
| -rw-r--r-- | arch/mips/momentum/jaguar_atx/ja-console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/momentum/jaguar_atx/ja-console.c b/arch/mips/momentum/jaguar_atx/ja-console.c index da6e1ed34db1..2292d0ec47fc 100644 --- a/arch/mips/momentum/jaguar_atx/ja-console.c +++ b/arch/mips/momentum/jaguar_atx/ja-console.c | |||
| @@ -93,7 +93,7 @@ static void inline ja_console_probe(void) | |||
| 93 | up.uartclk = JAGUAR_ATX_UART_CLK; | 93 | up.uartclk = JAGUAR_ATX_UART_CLK; |
| 94 | up.regshift = 2; | 94 | up.regshift = 2; |
| 95 | up.iotype = UPIO_MEM; | 95 | up.iotype = UPIO_MEM; |
| 96 | up.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 96 | up.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
| 97 | up.line = 0; | 97 | up.line = 0; |
| 98 | 98 | ||
| 99 | if (early_serial_setup(&up)) | 99 | if (early_serial_setup(&up)) |