Merge remote-tracking branch 'usb/usb-next'

[karo-tx-linux.git] / drivers / tty / serial / 8250 / 8250_exar_st16c554.c

diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c
index bf53aabf9b5e34919c9967f6d7e94106b04738b1..3a7cb8262bb9fa2701051d19f89a3354dd3e2e25 100644 (file)
--- a/drivers/tty/serial/8250/8250_exar_st16c554.c
+++ b/drivers/tty/serial/8250/8250_exar_st16c554.c
@@ -13,20 +13,13 @@
 #include <linux/init.h>
 #include <linux/serial_8250.h>
 
-#define PORT(_base,_irq)                               \
-       {                                               \
-               .iobase         = _base,                \
-               .irq            = _irq,                 \
-               .uartclk        = 1843200,              \
-               .iotype         = UPIO_PORT,            \
-               .flags          = UPF_BOOT_AUTOCONF,    \
-       }
+#include "8250.h"
 
 static struct plat_serial8250_port exar_data[] = {
-       PORT(0x100, 5),
-       PORT(0x108, 5),
-       PORT(0x110, 5),
-       PORT(0x118, 5),
+       SERIAL8250_PORT(0x100, 5),
+       SERIAL8250_PORT(0x108, 5),
+       SERIAL8250_PORT(0x110, 5),
+       SERIAL8250_PORT(0x118, 5),
        { },
 };