2 files changed, 1 insertions, 23 deletions

diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index dbf834f4dac4..198ecc08ab40 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -119,7 +119,7 @@
  */
 #define MACH_GROUP_MOMENCO      12      /* Momentum Boards              */
 #define  MACH_MOMENCO_OCELOT    0
-#define  MACH_MOMENCO_OCELOT_G  1
+#define  MACH_MOMENCO_OCELOT_G  1       /* no more supported (may 2007) */
 #define  MACH_MOMENCO_OCELOT_C  2
 #define  MACH_MOMENCO_JAGUAR_ATX 3
 #define  MACH_MOMENCO_OCELOT_3  4
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h
index d7a65135d837..5e0da6e2d698 100644
--- a/include/asm-mips/serial.h
+++ b/include/asm-mips/serial.h
@@ -134,27 +134,6 @@
 #define MOMENCO_OCELOT_SERIAL_PORT_DEFNS
 #endif
 
-#ifdef CONFIG_MOMENCO_OCELOT_G
-/* Ordinary NS16552 duart with a 20MHz crystal.  */
-#define OCELOT_G_BASE_BAUD ( 20000000 / 16 )
-
-#define OCELOT_G_SERIAL1_IRQ    4
-#if 0
-#define OCELOT_G_SERIAL1_BASE   0xe0001020
-#else
-#define OCELOT_G_SERIAL1_BASE   0xfd000020
-#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 }
-#define MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS                              \
-        _OCELOT_G_SERIAL_INIT(OCELOT_G_SERIAL1_IRQ, OCELOT_G_SERIAL1_BASE)
-#else
-#define MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS
-#endif
-
 #ifdef CONFIG_MOMENCO_OCELOT_C
 /* Ordinary NS16552 duart with a 20MHz crystal.  */
 #define OCELOT_C_BASE_BAUD ( 20000000 / 16 )
@@ -210,7 +189,6 @@
         IP32_SERIAL_PORT_DEFNS                          \
         JAZZ_SERIAL_PORT_DEFNS                          \
         STD_SERIAL_PORT_DEFNS                           \
-        MOMENCO_OCELOT_G_SERIAL_PORT_DEFNS              \
         MOMENCO_OCELOT_C_SERIAL_PORT_DEFNS              \
         MOMENCO_OCELOT_SERIAL_PORT_DEFNS                \
         MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS