8250: three way resolve of the 8250 diffs

This resolves the differences between the original 8250 patch, the revised 8250 patch
and the independant clean up of the octeon driver (to use platform devices properly yay!)

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 12 insertions, 10 deletions

diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index ac149d99f78f..fcb5b0e0f260 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -1147,15 +1147,17 @@ static void __devinit ioc3_8250_register(struct ioc3_uartregs __iomem *uart)
 {
 #define COSMISC_CONSTANT 6
 
-        struct uart_port port = {
-                .irq            = 0,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 0,
-                .uartclk        = (22000000 << 1) / COSMISC_CONSTANT,
-
-                .membase        = (unsigned char __iomem *) uart,
-                .mapbase        = (unsigned long) uart,
+        struct uart_8250_port port = {
+                .port = {
+                        .irq            = 0,
+                        .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
+                        .iotype         = UPIO_MEM,
+                        .regshift       = 0,
+                        .uartclk        = (22000000 << 1) / COSMISC_CONSTANT,
+
+                        .membase        = (unsigned char __iomem *) uart,
+                        .mapbase        = (unsigned long) uart,
+                }
         };
         unsigned char lcr;
 
@@ -1164,7 +1166,7 @@ static void __devinit ioc3_8250_register(struct ioc3_uartregs __iomem *uart)
         uart->iu_scr = COSMISC_CONSTANT,
         uart->iu_lcr = lcr;
         uart->iu_lcr;
-        serial8250_register_port(&port);
+        serial8250_register_8250_port(&port);
 }
 
 static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)