diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /arch/mips/rb532/serial.c | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'arch/mips/rb532/serial.c')
| -rw-r--r-- | arch/mips/rb532/serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/rb532/serial.c b/arch/mips/rb532/serial.c index 3e0d7ec3a579..00ed19f0bdb5 100644 --- a/arch/mips/rb532/serial.c +++ b/arch/mips/rb532/serial.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | extern unsigned int idt_cpu_freq; | 36 | extern unsigned int idt_cpu_freq; |
| 37 | 37 | ||
| 38 | static struct uart_port rb532_uart = { | 38 | static struct uart_port rb532_uart = { |
| 39 | .type = PORT_16550A, | 39 | .flags = UPF_BOOT_AUTOCONF, |
| 40 | .line = 0, | 40 | .line = 0, |
| 41 | .irq = UART0_IRQ, | 41 | .irq = UART0_IRQ, |
| 42 | .iotype = UPIO_MEM, | 42 | .iotype = UPIO_MEM, |