Index: include/asm-mips/serial.h
===================================================================
RCS file: /home/cvs/linux/include/asm-mips/serial.h,v
retrieving revision 1.32
diff -u -r1.32 serial.h
--- include/asm-mips/serial.h	13 Dec 2002 00:33:41 -0000	1.32
+++ include/asm-mips/serial.h	13 Dec 2002 18:43:44 -0000
@@ -64,9 +64,9 @@
 
 #ifdef CONFIG_MIPS_JAZZ
 #define _JAZZ_SERIAL_INIT(int, base)					\
-	{ .baud_base = JAZZ_BASE_BAUD, irq: int, flags: STD_COM_FLAGS,	\
-	  .iomem_base = (u8 *) base, iomem_reg_shift: 0,			\
-	  io_type: SERIAL_IO_MEM }
+	{ .baud_base = JAZZ_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS,	\
+	  .iomem_base = (u8 *) base, .iomem_reg_shift = 0,			\
+	  .io_type = SERIAL_IO_MEM }
 #define JAZZ_SERIAL_PORT_DEFNS						\
 	_JAZZ_SERIAL_INIT(JAZZ_SERIAL1_IRQ, JAZZ_SERIAL1_BASE),		\
 	_JAZZ_SERIAL_INIT(JAZZ_SERIAL2_IRQ, JAZZ_SERIAL2_BASE),
@@ -111,13 +111,13 @@
 #include <asm/galileo-boards/ev96100.h>
 #include <asm/galileo-boards/ev96100int.h>
 #define EV96100_SERIAL_PORT_DEFNS                                  \
-    { .baud_base = EV96100_BASE_BAUD, irq: EV96100INT_UART_0, \
+    { .baud_base = EV96100_BASE_BAUD, .irq = EV96100INT_UART_0, \
       .flags = STD_COM_FLAGS,  \
-      .iomem_base = EV96100_UART0_REGS_BASE, iomem_reg_shift: 2, \
+      .iomem_base = EV96100_UART0_REGS_BASE, .iomem_reg_shift = 2, \
       .io_type = SERIAL_IO_MEM }, \
-    { .baud_base = EV96100_BASE_BAUD, irq: EV96100INT_UART_0, \
+    { .baud_base = EV96100_BASE_BAUD, .irq = EV96100INT_UART_0, \
       .flags = STD_COM_FLAGS, \
-      .iomem_base = EV96100_UART1_REGS_BASE, iomem_reg_shift: 2, \
+      .iomem_base = EV96100_UART1_REGS_BASE, .iomem_reg_shift = 2, \
       .io_type = SERIAL_IO_MEM },
 #else
 #define EV96100_SERIAL_PORT_DEFNS
@@ -128,16 +128,16 @@
 #include <asm/it8172/it8172_int.h>
 #include <asm/it8712.h>
 #define ITE_SERIAL_PORT_DEFNS                                  \
-    { .baud_base = BASE_BAUD, port: (IT8172_PCI_IO_BASE + IT_UART_BASE), \
-      .irq = IT8172_UART_IRQ, flags: STD_COM_FLAGS, type: 0x3 }, \
-    { .baud_base = (24000000/(16*13)), port: (IT8172_PCI_IO_BASE + IT8712_UART1_PORT), \
-      .irq = IT8172_SERIRQ_4, flags: STD_COM_FLAGS, type: 0x3 }, \
+    { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_UART_BASE), \
+      .irq = IT8172_UART_IRQ, .flags = STD_COM_FLAGS, .type = 0x3 }, \
+    { .baud_base = (24000000/(16*13)), .port = (IT8172_PCI_IO_BASE + IT8712_UART1_PORT), \
+      .irq = IT8172_SERIRQ_4, .flags = STD_COM_FLAGS, .type = 0x3 }, \
     /* Smart Card Reader 0 */ \
-    { .baud_base = BASE_BAUD, port: (IT8172_PCI_IO_BASE + IT_SCR0_BASE), \
-      .irq = IT8172_SCR0_IRQ, flags: STD_COM_FLAGS, type: 0x3 }, \
+    { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_SCR0_BASE), \
+      .irq = IT8172_SCR0_IRQ, .flags = STD_COM_FLAGS, .type = 0x3 }, \
     /* Smart Card Reader 1 */ \
-    { .baud_base = BASE_BAUD, port: (IT8172_PCI_IO_BASE + IT_SCR1_BASE), \
-      .irq = IT8172_SCR1_IRQ, flags: STD_COM_FLAGS, type: 0x3 },
+    { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_SCR1_BASE), \
+      .irq = IT8172_SCR1_IRQ, .flags = STD_COM_FLAGS, .type = 0x3 },
 #else
 #define ITE_SERIAL_PORT_DEFNS
 #endif
@@ -146,11 +146,11 @@
 #include <asm/it8172/it8172.h>
 #include <asm/it8172/it8172_int.h>
 #define IVR_SERIAL_PORT_DEFNS                                  \
-    { .baud_base = BASE_BAUD, port: (IT8172_PCI_IO_BASE + IT_UART_BASE), \
-      .irq = IT8172_UART_IRQ, flags: STD_COM_FLAGS, type: 0x3 },         \
+    { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_UART_BASE), \
+      .irq = IT8172_UART_IRQ, .flags = STD_COM_FLAGS, .type = 0x3 },         \
     /* Smart Card Reader 1 */ \
-    { .baud_base = BASE_BAUD, port: (IT8172_PCI_IO_BASE + IT_SCR1_BASE), \
-      .irq = IT8172_SCR1_IRQ, flags: STD_COM_FLAGS, type: 0x3 },
+    { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_SCR1_BASE), \
+      .irq = IT8172_SCR1_IRQ, .flags = STD_COM_FLAGS, .type = 0x3 },
 #else
 #define IVR_SERIAL_PORT_DEFNS
 #endif
@@ -158,11 +158,11 @@
 #ifdef CONFIG_LASAT
 #include <asm/lasat/lasat.h>
 #define LASAT_SERIAL_PORT_DEFNS						\
-	{ .baud_base = LASAT_BASE_BAUD, irq: LASATINT_UART,		\
+	{ .baud_base = LASAT_BASE_BAUD, .irq = LASATINT_UART,		\
 	  .flags = STD_COM_FLAGS,						\
 	  .port = LASAT_UART_REGS_BASE, /* Only for display */		\
 	  .iomem_base = (u8 *)KSEG1ADDR(LASAT_UART_REGS_BASE),		\
-	  .iomem_reg_shift = LASAT_UART_REGS_SHIFT, io_type: SERIAL_IO_MEM }
+	  .iomem_reg_shift = LASAT_UART_REGS_SHIFT, .io_type = SERIAL_IO_MEM }
 #else
 #define LASAT_SERIAL_PORT_DEFNS
 #endif
@@ -170,14 +170,14 @@
 #ifdef CONFIG_AU1000_UART
 #include <asm/au1000.h>
 #define AU1000_SERIAL_PORT_DEFNS                              \
-    { .baud_base = 0, port: UART0_ADDR, irq: AU1000_UART0_INT,  \
-      .flags = STD_COM_FLAGS, type: 1 },                        \
-    { .baud_base = 0, port: UART1_ADDR, irq: AU1000_UART1_INT,  \
-      .flags = STD_COM_FLAGS, type: 1 },     \
-    { .baud_base = 0, port: UART2_ADDR, irq: AU1000_UART2_INT,  \
-      .flags = STD_COM_FLAGS, type: 1 },    \
-    { .baud_base = 0, port: UART3_ADDR, irq: AU1000_UART3_INT,  \
-      .flags = STD_COM_FLAGS, type: 1 },
+    { .baud_base = 0, .port = UART0_ADDR, .irq = AU1000_UART0_INT,  \
+      .flags = STD_COM_FLAGS, .type = 1 },                        \
+    { .baud_base = 0, .port = UART1_ADDR, .irq = AU1000_UART1_INT,  \
+      .flags = STD_COM_FLAGS, .type = 1 },     \
+    { .baud_base = 0, .port = UART2_ADDR, .irq = AU1000_UART2_INT,  \
+      .flags = STD_COM_FLAGS, .type = 1 },    \
+    { .baud_base = 0, .port = UART3_ADDR, .irq = AU1000_UART3_INT,  \
+      .flags = STD_COM_FLAGS, .type = 1 },
 #else
 #define AU1000_SERIAL_PORT_DEFNS
 #endif
@@ -185,10 +185,10 @@
 #ifdef CONFIG_TOSHIBA_JMR3927
 #include <asm/jmr3927/jmr3927.h>
 #define TXX927_SERIAL_PORT_DEFNS                              \
-    { .baud_base = JMR3927_BASE_BAUD, port: UART0_ADDR, irq: UART0_INT,  \
-      .flags = UART0_FLAGS, type: 1 },                        \
-    { .baud_base = JMR3927_BASE_BAUD, port: UART1_ADDR, irq: UART1_INT,  \
-      .flags = UART1_FLAGS, type: 1 },
+    { .baud_base = JMR3927_BASE_BAUD, .port = UART0_ADDR, .irq = UART0_INT,  \
+      .flags = UART0_FLAGS, .type = 1 },                        \
+    { .baud_base = JMR3927_BASE_BAUD, .port = UART1_ADDR, .irq = UART1_INT,  \
+      .flags = UART1_FLAGS, .type = 1 },
 #else
 #define TXX927_SERIAL_PORT_DEFNS
 #endif
@@ -281,9 +281,9 @@
 #define OCELOT_SERIAL1_BASE	0xe0001020
 
 #define _OCELOT_SERIAL_INIT(int, base)					\
-	{ .baud_base = OCELOT_BASE_BAUD, irq: int, flags: STD_COM_FLAGS,	\
-	  .iomem_base = (u8 *) base, iomem_reg_shift: 2,			\
-	  io_type: SERIAL_IO_MEM }
+	{ .baud_base = OCELOT_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS,	\
+	  .iomem_base = (u8 *) base, .iomem_reg_shift = 2,			\
+	  .io_type = SERIAL_IO_MEM }
 #define MOMENCO_OCELOT_SERIAL_PORT_DEFNS				\
 	_OCELOT_SERIAL_INIT(OCELOT_SERIAL1_IRQ, OCELOT_SERIAL1_BASE)
 #else
@@ -302,9 +302,9 @@
 #endif
 
 #define _OCELOT_G_SERIAL_INIT(int, base)				\
-	{ .baud_base = OCELOT_G_BASE_BAUD, irq: int, flags: STD_COM_FLAGS,\
-	  .iomem_base = (u8 *) base, iomem_reg_shift: 2,			\
-	  io_type: SERIAL_IO_MEM }
+	{ .baud_base = OCELOT_G_BASE_BAUD, .irq = int, .flags = STD_COM_FLAGS,\
+	  .iomem_base = (u8 *) base, .iomem_reg_shift = 2,			\
+	  .io_type = SERIAL_IO_MEM }
 #define MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS				\
 	_OCELOT_G_SERIAL_INIT(OCELOT_G_SERIAL1_IRQ, OCELOT_G_SERIAL1_BASE)
 #else