diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-08-01 18:07:03 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-08-01 18:07:03 -0400 |
| commit | 475d5928b79bb78326a645863d46ff95c5e25e5a (patch) | |
| tree | a260aed0d94bda824d7f2c5d74b2b1f8002634aa /arch/mips/rb532 | |
| parent | c6b7b9f290c0987194b966d5ea1383e10e1a01b1 (diff) | |
| parent | 1062080a7d8dbe08cefce728341285e77930ef49 (diff) | |
Merge branch '3.16-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/rb532')
| -rw-r--r-- | arch/mips/rb532/devices.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c index 03a4cdc80226..e31e8cdcb296 100644 --- a/arch/mips/rb532/devices.c +++ b/arch/mips/rb532/devices.c | |||
| @@ -223,6 +223,7 @@ static struct platform_device rb532_wdt = { | |||
| 223 | 223 | ||
| 224 | static struct plat_serial8250_port rb532_uart_res[] = { | 224 | static struct plat_serial8250_port rb532_uart_res[] = { |
| 225 | { | 225 | { |
| 226 | .type = PORT_16550A, | ||
| 226 | .membase = (char *)KSEG1ADDR(REGBASE + UART0BASE), | 227 | .membase = (char *)KSEG1ADDR(REGBASE + UART0BASE), |
| 227 | .irq = UART0_IRQ, | 228 | .irq = UART0_IRQ, |
| 228 | .regshift = 2, | 229 | .regshift = 2, |