[ar71xx] add experimental support for the Linksys WRT400N board (thanks to netprince)

[openwrt.git] / target / linux / generic-2.4 / patches / 000-linux_mips.patch
diff --git a/target/linux/generic-2.4/patches/000-linux_mips.patch b/target/linux/generic-2.4/patches/000-linux_mips.patch

index 16177c5..ea973bd 100644 (file)
--- a/target/linux/generic-2.4/patches/000-linux_mips.patch
+++ b/target/linux/generic-2.4/patches/000-linux_mips.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/au1xxx_irqmap.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/au1xxx_irqmap.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/au1xxx_irqmap.c   2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/au1xxx_irqmap.c      2005-01-30 09:01:27.000000000 +0100
-@@ -172,14 +172,14 @@
+Index: linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/au1xxx_irqmap.c
++++ linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c
+@@ -172,14 +172,14 @@ au1xxx_irq_map_t au1xxx_ic0_map[] = {
         { AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
         { AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0},
         { AU1550_PSC3_INT, INTC_INT_HIGH_LEVEL, 0},
@@ -24,7 +25,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/au1xxx_irqmap.c linux-2.4.32-
         { AU1550_NAND_INT, INTC_INT_RISE_EDGE, 0},
         { AU1550_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 },
         { AU1550_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 },
-@@ -200,14 +200,14 @@
+@@ -200,14 +200,14 @@ au1xxx_irq_map_t au1xxx_ic0_map[] = {
         { AU1200_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
         { AU1200_AES_INT, INTC_INT_HIGH_LEVEL, 0},
         { AU1200_CAMERA_INT, INTC_INT_HIGH_LEVEL, 0},
@@ -47,10 +48,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/au1xxx_irqmap.c linux-2.4.32-
         { AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0},
         { AU1200_USB_INT, INTC_INT_HIGH_LEVEL, 0 },
         { AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0},
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/cputable.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/cputable.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/cputable.c        2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/cputable.c   2005-01-30 09:01:27.000000000 +0100
-@@ -39,7 +39,8 @@
+Index: linux-2.4.35.4/arch/mips/au1000/common/cputable.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/cputable.c
++++ linux-2.4.35.4/arch/mips/au1000/common/cputable.c
+@@ -39,7 +39,8 @@ struct cpu_spec      cpu_specs[] = {
       { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1 },
       { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 },
       { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 },
@@ -60,9 +62,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/cputable.c linux-2.4.32-rc1.m
       { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 },
   };
   
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/dbdma.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c   2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/dbdma.c      2005-02-08 07:28:37.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/dbdma.c
++++ linux-2.4.35.4/arch/mips/au1000/common/dbdma.c
  @@ -41,6 +41,8 @@
   #include <asm/au1xxx_dbdma.h>
   #include <asm/system.h>
@@ -72,7 +75,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   #if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200)
   
   /*
-@@ -60,37 +62,10 @@
+@@ -60,37 +62,10 @@ static spinlock_t au1xxx_dbdma_spin_lock
   */
   #define ALIGN_ADDR(x, a)      ((((u32)(x)) + (a-1)) & ~(a-1))
   
@@ -112,7 +115,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   static dbdev_tab_t dbdev_tab[] = {
   #ifdef CONFIG_SOC_AU1550
         /* UARTS */
-@@ -156,13 +131,13 @@
+@@ -156,13 +131,13 @@ static dbdev_tab_t dbdev_tab[] = {
         { DSCR_CMD0_MAE_BOTH, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
         { DSCR_CMD0_LCD, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
   
@@ -132,7 +135,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   
         { DSCR_CMD0_PSC0_TX, DEV_FLAGS_OUT, 0, 0, 0x11a0001c, 0, 0 },
         { DSCR_CMD0_PSC0_RX, DEV_FLAGS_IN, 0, 0, 0x11a0001c, 0, 0 },
-@@ -172,9 +147,9 @@
+@@ -172,9 +147,9 @@ static dbdev_tab_t dbdev_tab[] = {
         { DSCR_CMD0_PSC1_RX, DEV_FLAGS_IN, 0, 0, 0x11b0001c, 0, 0 },
         { DSCR_CMD0_PSC1_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
   
@@ -145,7 +148,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
         { DSCR_CMD0_CIM_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
   
         { DSCR_CMD0_NAND_FLASH, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },
-@@ -183,6 +158,24 @@
+@@ -183,6 +158,24 @@ static dbdev_tab_t dbdev_tab[] = {
   
         { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
         { DSCR_CMD0_ALWAYS, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
@@ -170,7 +173,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   };
   
   #define DBDEV_TAB_SIZE (sizeof(dbdev_tab) / sizeof(dbdev_tab_t))
-@@ -202,6 +195,30 @@
+@@ -202,6 +195,30 @@ find_dbdev_id (u32 id)
         return NULL;
   }
   
@@ -201,7 +204,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   /* Allocate a channel and return a non-zero descriptor if successful.
   */
   u32
-@@ -214,7 +231,7 @@
+@@ -214,7 +231,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
         int             i;
         dbdev_tab_t     *stp, *dtp;
         chan_tab_t      *ctp;
@@ -210,7 +213,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   
         /* We do the intialization on the first channel allocation.
          * We have to wait because of the interrupt handler initialization
-@@ -224,9 +241,6 @@
+@@ -224,9 +241,6 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
                 au1xxx_dbdma_init();
         dbdma_initialized = 1;
   
@@ -220,7 +223,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
         if ((stp = find_dbdev_id(srcid)) == NULL) return 0;
         if ((dtp = find_dbdev_id(destid)) == NULL) return 0;
   
-@@ -268,9 +282,9 @@
+@@ -268,9 +282,9 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
                                 /* If kmalloc fails, it is caught below same
                                  * as a channel not available.
                                  */
@@ -232,7 +235,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
                                 break;
                         }
                 }
-@@ -278,10 +292,11 @@
+@@ -278,10 +292,11 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
   
                 if (ctp != NULL) {
                         memset(ctp, 0, sizeof(chan_tab_t));
@@ -245,7 +248,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
                         ctp->chan_src = stp;
                         ctp->chan_dest = dtp;
                         ctp->chan_callback = callback;
-@@ -298,6 +313,9 @@
+@@ -298,6 +313,9 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
                                 i |= DDMA_CFG_DED;
                         if (dtp->dev_intpolarity)
                                 i |= DDMA_CFG_DP;
@@ -255,7 +258,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
                         cp->ddma_cfg = i;
                         au_sync();
   
-@@ -308,14 +326,14 @@
+@@ -308,14 +326,14 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d
                         rv = (u32)(&chan_tab_ptr[chan]);
                 }
                 else {
@@ -272,7 +275,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   
   /* Set the device width if source or destination is a FIFO.
    * Should be 8, 16, or 32 bits.
-@@ -343,6 +361,7 @@
+@@ -343,6 +361,7 @@ au1xxx_dbdma_set_devwidth(u32 chanid, in
   
         return rv;
   }
@@ -280,7 +283,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   
   /* Allocate a descriptor ring, initializing as much as possible.
   */
-@@ -369,7 +388,8 @@
+@@ -369,7 +388,8 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int 
          * and if we try that first we are likely to not waste larger
          * slabs of memory.
          */
@@ -290,7 +293,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
         if (desc_base == 0)
                 return 0;
         
-@@ -380,7 +400,7 @@
+@@ -380,7 +400,7 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int 
                 kfree((const void *)desc_base);
                 i = entries * sizeof(au1x_ddma_desc_t);
                 i += (sizeof(au1x_ddma_desc_t) - 1);
@@ -299,7 +302,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
                         return 0;
   
                 desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t));
-@@ -460,9 +480,14 @@
+@@ -460,9 +480,14 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int 
         /* If source input is fifo, set static address.
         */
         if (stp->dev_flags & DEV_FLAGS_IN) {
@@ -316,7 +319,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   
         /* Set up dest1.  For now, assume no stride and increment.
          * A channel attribute update can change this later.
-@@ -486,10 +511,18 @@
+@@ -486,10 +511,18 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int 
         /* If destination output is fifo, set static address.
         */
         if (dtp->dev_flags & DEV_FLAGS_OUT) {
@@ -336,7 +339,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
         for (i=0; i<entries; i++) {
                 dp->dscr_cmd0 = cmd0;
                 dp->dscr_cmd1 = cmd1;
-@@ -498,6 +531,7 @@
+@@ -498,6 +531,7 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int 
                 dp->dscr_dest0 = dest0;
                 dp->dscr_dest1 = dest1;
                 dp->dscr_stat = 0;
@@ -344,7 +347,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
                 dp->dscr_nxtptr = DSCR_NXTPTR(virt_to_phys(dp + 1));
                 dp++;
         }
-@@ -510,13 +544,14 @@
+@@ -510,13 +544,14 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int 
   
         return (u32)(ctp->chan_desc_base);
   }
@@ -360,7 +363,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   {
         chan_tab_t              *ctp;
         au1x_ddma_desc_t        *dp;
-@@ -543,24 +578,40 @@
+@@ -543,24 +578,40 @@ au1xxx_dbdma_put_source(u32 chanid, void
         */
         dp->dscr_source0 = virt_to_phys(buf);
         dp->dscr_cmd1 = nbytes;
@@ -405,7 +408,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   {
         chan_tab_t              *ctp;
         au1x_ddma_desc_t        *dp;
-@@ -582,11 +633,33 @@
+@@ -582,11 +633,33 @@ au1xxx_dbdma_put_dest(u32 chanid, void *
         if (dp->dscr_cmd0 & DSCR_CMD0_V)
                 return 0;
         
@@ -441,7 +444,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
         
         /* Get next descriptor pointer.
         */
-@@ -596,6 +669,7 @@
+@@ -596,6 +669,7 @@ au1xxx_dbdma_put_dest(u32 chanid, void *
         */
         return nbytes;
   }
@@ -449,7 +452,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   
   /* Get a destination buffer into the DMA ring.
    * Normally used to get a full buffer from the ring during fifo
-@@ -645,7 +719,7 @@
+@@ -645,7 +719,7 @@ void
   au1xxx_dbdma_stop(u32 chanid)
   {
         chan_tab_t      *ctp;
@@ -458,7 +461,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
         int halt_timeout = 0;
   
         ctp = *((chan_tab_t **)chanid);
-@@ -665,6 +739,7 @@
+@@ -665,6 +739,7 @@ au1xxx_dbdma_stop(u32 chanid)
         cp->ddma_stat |= (DDMA_STAT_DB | DDMA_STAT_V);
         au_sync();
   }
@@ -466,7 +469,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   
   /* Start using the current descriptor pointer.  If the dbdma encounters
    * a not valid descriptor, it will stop.  In this case, we can just
-@@ -674,17 +749,17 @@
+@@ -674,17 +749,17 @@ void
   au1xxx_dbdma_start(u32 chanid)
   {
         chan_tab_t      *ctp;
@@ -487,7 +490,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   
   void
   au1xxx_dbdma_reset(u32 chanid)
-@@ -703,15 +778,21 @@
+@@ -703,15 +778,21 @@ au1xxx_dbdma_reset(u32 chanid)
   
         do {
                 dp->dscr_cmd0 &= ~DSCR_CMD0_V;
@@ -510,7 +513,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
         u32             rv;
   
         ctp = *((chan_tab_t **)chanid);
-@@ -746,15 +827,16 @@
+@@ -746,15 +827,16 @@ au1xxx_dbdma_chan_free(u32 chanid)
   
         kfree(ctp);
   }
@@ -529,7 +532,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   
         intstat = dbdma_gptr->ddma_intstat;
         au_sync();
-@@ -773,18 +855,26 @@
+@@ -773,18 +855,26 @@ dbdma_interrupt(int irq, void *dev_id, s
                 (ctp->chan_callback)(irq, ctp->chan_callparam, regs);
   
         ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
@@ -560,7 +563,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
                         "Au1xxx dbdma", (void *)dbdma_gptr))
                 printk("Can't get 1550 dbdma irq");
   }
-@@ -795,7 +885,8 @@
+@@ -795,7 +885,8 @@ au1xxx_dbdma_dump(u32 chanid)
         chan_tab_t              *ctp;
         au1x_ddma_desc_t        *dp;
         dbdev_tab_t             *stp, *dtp;
@@ -570,7 +573,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
   
         ctp = *((chan_tab_t **)chanid);
         stp = ctp->chan_src;
-@@ -820,15 +911,64 @@
+@@ -820,15 +911,64 @@ au1xxx_dbdma_dump(u32 chanid)
         dp = ctp->chan_desc_base;
   
         do {
@@ -641,9 +644,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/dbdma.c linux-2.4.32-rc1.mips
  +
   #endif /* defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) */
   
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/gpio.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/gpio.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/gpio.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/gpio.c       2005-01-30 09:01:27.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/common/gpio.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/common/gpio.c
  @@ -0,0 +1,118 @@
  +/*
  + *  This program is free software; you can redistribute        it and/or modify it
@@ -763,10 +767,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/gpio.c linux-2.4.32-rc1.mips/
  +EXPORT_SYMBOL(au1xxx_gpio_tristate);
  +EXPORT_SYMBOL(au1xxx_gpio_write);
  +EXPORT_SYMBOL(au1xxx_gpio_read);
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/irq.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/irq.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/irq.c     2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/irq.c        2005-03-13 08:56:57.000000000 +0100
-@@ -303,8 +303,30 @@
+Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/irq.c
++++ linux-2.4.35.4/arch/mips/au1000/common/irq.c
+@@ -303,8 +303,30 @@ static struct hw_interrupt_type level_ir
   };
   
   #ifdef CONFIG_PM
@@ -798,7 +803,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/irq.c linux-2.4.32-rc1.mips/a
         local_enable_irq(AU1000_TOY_MATCH2_INT);
   }
   #endif
-@@ -508,6 +530,7 @@
+@@ -508,6 +530,7 @@ void intc0_req0_irqdispatch(struct pt_re
   
         if (!intc0_req0) return;
   
@@ -806,7 +811,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/irq.c linux-2.4.32-rc1.mips/a
         /*
          * Because of the tight timing of SETUP token to reply
          * transactions, the USB devices-side packet complete
-@@ -518,6 +541,7 @@
+@@ -518,6 +541,7 @@ void intc0_req0_irqdispatch(struct pt_re
                 do_IRQ(AU1000_USB_DEV_REQ_INT, regs);
                 return;
         }
@@ -814,7 +819,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/irq.c linux-2.4.32-rc1.mips/a
   
         irq = au_ffs(intc0_req0) - 1;
         intc0_req0 &= ~(1<<irq);
-@@ -536,17 +560,7 @@
+@@ -536,17 +560,7 @@ void intc0_req1_irqdispatch(struct pt_re
   
         irq = au_ffs(intc0_req1) - 1;
         intc0_req1 &= ~(1<<irq);
@@ -833,10 +838,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/irq.c linux-2.4.32-rc1.mips/a
   }
   
   
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/Makefile linux-2.4.32-rc1.mips/arch/mips/au1000/common/Makefile
---- linux-2.4.32-rc1/arch/mips/au1000/common/Makefile  2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/Makefile     2005-01-30 09:01:27.000000000 +0100
-@@ -19,9 +19,9 @@
+Index: linux-2.4.35.4/arch/mips/au1000/common/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/Makefile
++++ linux-2.4.35.4/arch/mips/au1000/common/Makefile
+@@ -19,9 +19,9 @@ O_TARGET := au1000.o
   export-objs           = prom.o clocks.o power.o usbdev.o
   
   obj-y := prom.o int-handler.o irq.o puts.o time.o reset.o cputable.o \
@@ -848,10 +854,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/Makefile linux-2.4.32-rc1.mip
   
   obj-$(CONFIG_AU1X00_USB_DEVICE) += usbdev.o
   obj-$(CONFIG_KGDB) += dbg_io.o
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/pci_fixup.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/pci_fixup.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/pci_fixup.c       2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/pci_fixup.c  2004-12-03 09:00:32.000000000 +0100
-@@ -75,9 +75,13 @@
+Index: linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/pci_fixup.c
++++ linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c
+@@ -75,9 +75,13 @@ void __init pcibios_fixup(void)
   
   #ifdef CONFIG_NONCOHERENT_IO
         /* 
@@ -867,10 +874,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/pci_fixup.c linux-2.4.32-rc1.
         printk("Non-coherent PCI accesses enabled\n");
   #endif
   
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/pci_ops.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/pci_ops.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/pci_ops.c 2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/pci_ops.c    2005-02-27 23:14:24.000000000 +0100
-@@ -162,6 +162,7 @@
+Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/pci_ops.c
++++ linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c
+@@ -162,6 +162,7 @@ unsigned long last_entryLo0, last_entryL
   static int config_access(unsigned char access_type, struct pci_dev *dev, 
                          unsigned char where, u32 * data)
   {
@@ -878,7 +886,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/pci_ops.c linux-2.4.32-rc1.mi
   #if defined( CONFIG_SOC_AU1500 ) || defined( CONFIG_SOC_AU1550 )
         unsigned char bus = dev->bus->number;
         unsigned int dev_fn = dev->devfn;
-@@ -170,7 +171,6 @@
+@@ -170,7 +171,6 @@ static int config_access(unsigned char a
         unsigned long offset, status;
         unsigned long cfg_base;
         unsigned long flags;
@@ -886,7 +894,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/pci_ops.c linux-2.4.32-rc1.mi
         unsigned long entryLo0, entryLo1;
   
         if (device > 19) {
-@@ -205,9 +205,8 @@
+@@ -205,9 +205,8 @@ static int config_access(unsigned char a
                 last_entryLo0  = last_entryLo1 = 0xffffffff;
         }
   
@@ -898,7 +906,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/pci_ops.c linux-2.4.32-rc1.mi
          */
         if (board_pci_idsel) {
                 if (board_pci_idsel(device, 1) == 0) {
-@@ -271,8 +270,11 @@
+@@ -271,8 +270,11 @@ static int config_access(unsigned char a
         }
   
         local_irq_restore(flags);
@@ -911,9 +919,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/pci_ops.c linux-2.4.32-rc1.mi
   }
   #endif
   
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/power.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/power.c   2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/power.c      2005-04-07 02:37:19.000000000 +0200
+Index: linux-2.4.35.4/arch/mips/au1000/common/power.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/power.c
++++ linux-2.4.35.4/arch/mips/au1000/common/power.c
  @@ -50,7 +50,6 @@
   
   static void calibrate_delay(void);
@@ -922,7 +931,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips
   extern unsigned int get_au1x00_speed(void);
   extern unsigned long get_au1x00_uart_baud_base(void);
   extern void set_au1x00_uart_baud_base(unsigned long new_baud_base);
-@@ -116,6 +115,7 @@
+@@ -116,6 +115,7 @@ save_core_regs(void)
         sleep_uart0_clkdiv = au_readl(UART0_ADDR + UART_CLK);
         sleep_uart0_enable = au_readl(UART0_ADDR + UART_MOD_CNTRL);
   
@@ -930,7 +939,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips
         /* Shutdown USB host/device.
         */
         sleep_usbhost_enable = au_readl(USB_HOST_CONFIG);
-@@ -127,6 +127,7 @@
+@@ -127,6 +127,7 @@ save_core_regs(void)
   
         sleep_usbdev_enable = au_readl(USBD_ENABLE);
         au_writel(0, USBD_ENABLE); au_sync();
@@ -938,7 +947,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips
   
         /* Save interrupt controller state.
         */
-@@ -212,14 +213,12 @@
+@@ -212,14 +213,12 @@ void wakeup_from_suspend(void)
   int au_sleep(void)
   {
         unsigned long wakeup, flags;
@@ -954,7 +963,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips
         /** The code below is all system dependent and we should probably
          ** have a function call out of here to set this up.  You need
          ** to configure the GPIO or timer interrupts that will bring
-@@ -227,27 +226,26 @@
+@@ -227,27 +226,26 @@ int au_sleep(void)
          ** For testing, the TOY counter wakeup is useful.
          **/
   
@@ -987,7 +996,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips
         save_and_sleep();
   
         /* after a wakeup, the cpu vectors back to 0x1fc00000 so
-@@ -255,6 +253,7 @@
+@@ -255,6 +253,7 @@ int au_sleep(void)
          */
         restore_core_regs();
         spin_unlock_irqrestore(&pm_lock, flags);
@@ -995,7 +1004,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips
         return 0;
   }
   
-@@ -285,7 +284,6 @@
+@@ -285,7 +284,6 @@ static int pm_do_sleep(ctl_table * ctl, 
   
                 if (retval)
                         return retval;
@@ -1003,7 +1012,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips
                 au_sleep();
                 retval = pm_send_all(PM_RESUME, (void *) 0);
         }
-@@ -296,7 +294,6 @@
+@@ -296,7 +294,6 @@ static int pm_do_suspend(ctl_table * ctl
                          void *buffer, size_t * len)
   {
         int retval = 0;
@@ -1011,7 +1020,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips
   
         if (!write) {
                 *len = 0;
-@@ -305,119 +302,9 @@
+@@ -305,119 +302,9 @@ static int pm_do_suspend(ctl_table * ctl
                 if (retval)
                         return retval;
                 suspend_mode = 1;
@@ -1132,7 +1141,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips
         return retval;
   }
   
-@@ -425,7 +312,6 @@
+@@ -425,7 +312,6 @@ static int pm_do_freq(ctl_table * ctl, i
   static struct ctl_table pm_table[] = {
         {ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend},
         {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep},
@@ -1140,9 +1149,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/power.c linux-2.4.32-rc1.mips
         {0}
   };
   
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/reset.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/reset.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/reset.c   2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/reset.c      2005-03-19 08:17:51.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/reset.c
++++ linux-2.4.35.4/arch/mips/au1000/common/reset.c
  @@ -37,8 +37,6 @@
   #include <asm/system.h>
   #include <asm/au1000.h>
@@ -1152,7 +1162,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/reset.c linux-2.4.32-rc1.mips
   void au1000_restart(char *command)
   {
         /* Set all integrated peripherals to disabled states */
-@@ -144,6 +142,26 @@
+@@ -144,6 +142,26 @@ void au1000_restart(char *command)
                 au_writel(0x00, 0xb1900064); /* sys_auxpll */
                 au_writel(0x00, 0xb1900100); /* sys_pininputen */
                 break;
@@ -1179,7 +1189,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/reset.c linux-2.4.32-rc1.mips
   
         default:
                 break;
-@@ -163,32 +181,23 @@
+@@ -163,32 +181,23 @@ void au1000_restart(char *command)
   
   void au1000_halt(void)
   {
@@ -1223,10 +1233,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/reset.c linux-2.4.32-rc1.mips
  +      /* If board can't power-off, spin forever */
         au1000_halt();
   }
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/setup.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/setup.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/setup.c   2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/setup.c      2005-01-30 09:01:27.000000000 +0100
-@@ -174,6 +174,40 @@
+Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/setup.c
++++ linux-2.4.35.4/arch/mips/au1000/common/setup.c
+@@ -174,6 +174,40 @@ void __init au1x00_setup(void)
         initrd_end = (unsigned long)&__rd_end;
   #endif
   
@@ -1267,7 +1278,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/setup.c linux-2.4.32-rc1.mips
   #if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
   #ifdef CONFIG_USB_OHCI
         if ((argptr = strstr(argptr, "usb_ohci=")) == NULL) {
-@@ -187,19 +221,38 @@
+@@ -187,19 +221,38 @@ void __init au1x00_setup(void)
   #endif
   
   #ifdef CONFIG_USB_OHCI
@@ -1310,7 +1321,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/setup.c linux-2.4.32-rc1.mips
         conswitchp = &dummy_con;
   #endif
   
-@@ -209,8 +262,7 @@
+@@ -209,8 +262,7 @@ void __init au1x00_setup(void)
   #endif
   
   #ifdef CONFIG_BLK_DEV_IDE
@@ -1320,9 +1331,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/setup.c linux-2.4.32-rc1.mips
         if ((ide_ops == NULL) || (ide_ops == &no_ide_ops))
                 ide_ops = &std_ide_ops;
   #endif
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/sleeper.S linux-2.4.32-rc1.mips/arch/mips/au1000/common/sleeper.S
---- linux-2.4.32-rc1/arch/mips/au1000/common/sleeper.S 2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/sleeper.S    2005-01-30 09:01:27.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/sleeper.S
++++ linux-2.4.35.4/arch/mips/au1000/common/sleeper.S
  @@ -15,17 +15,48 @@
   #include <asm/addrspace.h>
   #include <asm/regdef.h>
@@ -1377,7 +1389,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/sleeper.S linux-2.4.32-rc1.mi
         subu    sp, PT_SIZE
         sw      $1, PT_R1(sp)
         sw      $2, PT_R2(sp)
-@@ -34,14 +65,6 @@
+@@ -34,14 +65,6 @@ LEAF(save_and_sleep)
         sw      $5, PT_R5(sp)
         sw      $6, PT_R6(sp)
         sw      $7, PT_R7(sp)
@@ -1392,7 +1404,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/sleeper.S linux-2.4.32-rc1.mi
         sw      $16, PT_R16(sp)
         sw      $17, PT_R17(sp)
         sw      $18, PT_R18(sp)
-@@ -50,32 +73,47 @@
+@@ -50,32 +73,47 @@ LEAF(save_and_sleep)
         sw      $21, PT_R21(sp)
         sw      $22, PT_R22(sp)
         sw      $23, PT_R23(sp)
@@ -1455,7 +1467,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/sleeper.S linux-2.4.32-rc1.mi
   
   /* Put SDRAM into self refresh.  Preload instructions into cache,
    * issue a precharge, then auto refresh, then sleep commands to it.
-@@ -88,30 +126,65 @@
+@@ -88,30 +126,65 @@ LEAF(save_and_sleep)
         cache   0x14, 96(t0)
         .set    mips0
   
@@ -1534,7 +1546,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/sleeper.S linux-2.4.32-rc1.mi
         mtc0    k0, CP0_CONFIG
         lw      $1, PT_R1(sp)
         lw      $2, PT_R2(sp)
-@@ -120,14 +193,6 @@
+@@ -120,14 +193,6 @@ sdsleep:
         lw      $5, PT_R5(sp)
         lw      $6, PT_R6(sp)
         lw      $7, PT_R7(sp)
@@ -1549,7 +1561,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/sleeper.S linux-2.4.32-rc1.mi
         lw      $16, PT_R16(sp)
         lw      $17, PT_R17(sp)
         lw      $18, PT_R18(sp)
-@@ -136,15 +201,36 @@
+@@ -136,15 +201,36 @@ sdsleep:
         lw      $21, PT_R21(sp)
         lw      $22, PT_R22(sp)
         lw      $23, PT_R23(sp)
@@ -1591,9 +1603,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/sleeper.S linux-2.4.32-rc1.mi
  +      .set reorder
   END(save_and_sleep)
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/time.c linux-2.4.32-rc1.mips/arch/mips/au1000/common/time.c
---- linux-2.4.32-rc1/arch/mips/au1000/common/time.c    2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/common/time.c       2005-04-08 10:33:17.000000000 +0200
+Index: linux-2.4.35.4/arch/mips/au1000/common/time.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/time.c
++++ linux-2.4.35.4/arch/mips/au1000/common/time.c
  @@ -50,7 +50,6 @@
   #include <linux/mc146818rtc.h>
   #include <linux/timex.h>
@@ -1602,7 +1615,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/time.c linux-2.4.32-rc1.mips/
   extern void do_softirq(void);
   extern volatile unsigned long wall_jiffies;
   unsigned long missed_heart_beats = 0;
-@@ -59,14 +58,14 @@
+@@ -59,14 +58,14 @@ static unsigned long r4k_offset; /* Amou
   static unsigned long r4k_cur;    /* What counter should be at next timer irq */
   extern rwlock_t xtime_lock;
   int   no_au1xxx_32khz;
@@ -1619,7 +1632,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/time.c linux-2.4.32-rc1.mips/
   static unsigned long last_pc0, last_match20;
   #endif
   
-@@ -385,7 +384,6 @@
+@@ -385,7 +384,6 @@ void __init au1xxx_timer_setup(void)
   {
           unsigned int est_freq;
         extern unsigned long (*do_gettimeoffset)(void);
@@ -1627,7 +1640,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/time.c linux-2.4.32-rc1.mips/
   
         printk("calculating r4koff... ");
         r4k_offset = cal_r4koff();
-@@ -437,9 +435,6 @@
+@@ -437,9 +435,6 @@ void __init au1xxx_timer_setup(void)
                 au_writel(0, SYS_TOYWRITE);
                 while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S);
   
@@ -1637,7 +1650,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/time.c linux-2.4.32-rc1.mips/
                 while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20);
   
                 /* setup match20 to interrupt once every 10ms */
-@@ -447,13 +442,13 @@
+@@ -447,13 +442,13 @@ void __init au1xxx_timer_setup(void)
                 au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2);
                 au_sync();
                 while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20);
@@ -1653,9 +1666,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/common/time.c linux-2.4.32-rc1.mips/
         }
   
   #else
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/db1x00/board_setup.c linux-2.4.32-rc1.mips/arch/mips/au1000/db1x00/board_setup.c
---- linux-2.4.32-rc1/arch/mips/au1000/db1x00/board_setup.c     2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/db1x00/board_setup.c        2005-03-19 08:17:51.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/board_setup.c
++++ linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c
  @@ -46,10 +46,22 @@
   #include <asm/au1000.h>
   #include <asm/db1x00.h>
@@ -1682,7 +1696,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/db1x00/board_setup.c linux-2.4.32-rc
   
   void board_reset (void)
   {
-@@ -57,6 +69,13 @@
+@@ -57,6 +69,13 @@ void board_reset (void)
         au_writel(0x00000000, 0xAE00001C);
   }
   
@@ -1696,7 +1710,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/db1x00/board_setup.c linux-2.4.32-rc
   void __init board_setup(void)
   {
         u32 pin_func;
-@@ -108,8 +127,42 @@
+@@ -108,8 +127,42 @@ void __init board_setup(void)
         au_writel(0x02000200, GPIO2_OUTPUT);
   #endif
   
@@ -1739,10 +1753,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/db1x00/board_setup.c linux-2.4.32-rc
   #ifdef CONFIG_MIPS_DB1000
       printk("AMD Alchemy Au1000/Db1000 Board\n");
   #endif
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/db1x00/irqmap.c linux-2.4.32-rc1.mips/arch/mips/au1000/db1x00/irqmap.c
---- linux-2.4.32-rc1/arch/mips/au1000/db1x00/irqmap.c  2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/db1x00/irqmap.c     2005-01-30 09:06:19.000000000 +0100
-@@ -53,6 +53,7 @@
+Index: linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/irqmap.c
++++ linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c
+@@ -53,6 +53,7 @@ au1xxx_irq_map_t au1xxx_irq_map[] = {
   #ifdef CONFIG_MIPS_DB1550
         { AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 IRQ#
         { AU1000_GPIO_5, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 1 IRQ#
@@ -1750,10 +1765,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/db1x00/irqmap.c linux-2.4.32-rc1.mip
   #else
         { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 Fully_Interted#
         { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 STSCHG#
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/db1x00/Makefile linux-2.4.32-rc1.mips/arch/mips/au1000/db1x00/Makefile
---- linux-2.4.32-rc1/arch/mips/au1000/db1x00/Makefile  2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/db1x00/Makefile     2005-01-30 09:06:19.000000000 +0100
-@@ -17,4 +17,11 @@
+Index: linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/Makefile
++++ linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile
+@@ -17,4 +17,11 @@ O_TARGET := db1x00.o
   obj-y := init.o board_setup.o irqmap.o
   obj-$(CONFIG_WM97XX_COMODULE) += mirage_ts.o
   
@@ -1765,9 +1781,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/db1x00/Makefile linux-2.4.32-rc1.mip
  +endif
  +
   include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/db1x00/mmc_support.c linux-2.4.32-rc1.mips/arch/mips/au1000/db1x00/mmc_support.c
---- linux-2.4.32-rc1/arch/mips/au1000/db1x00/mmc_support.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/db1x00/mmc_support.c        2005-01-30 09:07:01.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c
  @@ -0,0 +1,126 @@
  +/*
  + * BRIEF MODULE DESCRIPTION
@@ -1895,9 +1912,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/db1x00/mmc_support.c linux-2.4.32-rc
  +EXPORT_SYMBOL(mmc_power_on);
  +EXPORT_SYMBOL(mmc_power_off);
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/au1200_ibutton.c linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/au1200_ibutton.c
---- linux-2.4.32-rc1/arch/mips/au1000/ficmmp/au1200_ibutton.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/au1200_ibutton.c     2005-02-03 07:35:29.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c
  @@ -0,0 +1,270 @@
  +/* ---------------------------------------------------------------------- 
  + *  mtwilson_keys.c
@@ -2169,9 +2187,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/au1200_ibutton.c linux-2.4.32
  +MODULE_AUTHOR( DRIVER_AUTHOR );
  +MODULE_DESCRIPTION( DRIVER_DESC );
  +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/au1xxx_dock.c linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/au1xxx_dock.c
---- linux-2.4.32-rc1/arch/mips/au1000/ficmmp/au1xxx_dock.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/au1xxx_dock.c        2005-01-30 09:01:27.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c
  @@ -0,0 +1,261 @@
  +/*
  + *  Copyright (C) 2003 Metrowerks, All Rights Reserved.
@@ -2434,9 +2453,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/au1xxx_dock.c linux-2.4.32-rc
  +
  +module_init(au1xxx_dock_init);
  +module_exit(au1xxx_dock_exit);
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/board_setup.c linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/board_setup.c
---- linux-2.4.32-rc1/arch/mips/au1000/ficmmp/board_setup.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/board_setup.c        2005-03-19 08:17:51.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c
  @@ -0,0 +1,226 @@
  +/*
  + *
@@ -2664,9 +2684,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/board_setup.c linux-2.4.32-rc
  +      return 0;
  +}
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/init.c linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/init.c
---- linux-2.4.32-rc1/arch/mips/au1000/ficmmp/init.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/init.c       2005-01-30 09:01:27.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c
  @@ -0,0 +1,76 @@
  +/*
  + *
@@ -2744,9 +2765,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/init.c linux-2.4.32-rc1.mips/
  +      return 0;
  +}
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/irqmap.c linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/irqmap.c
---- linux-2.4.32-rc1/arch/mips/au1000/ficmmp/irqmap.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/irqmap.c     2005-01-30 09:01:27.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c
  @@ -0,0 +1,61 @@
  +/*
  + * BRIEF MODULE DESCRIPTION
@@ -2809,9 +2831,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/irqmap.c linux-2.4.32-rc1.mip
  +
  +int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/Makefile linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/Makefile
---- linux-2.4.32-rc1/arch/mips/au1000/ficmmp/Makefile  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/ficmmp/Makefile     2005-01-30 09:01:27.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile
  @@ -0,0 +1,25 @@
  +#
  +#  Copyright 2000 MontaVista Software Inc.
@@ -2838,10 +2861,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/ficmmp/Makefile linux-2.4.32-rc1.mip
  +
  +
  +include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/board_setup.c linux-2.4.32-rc1.mips/arch/mips/au1000/hydrogen3/board_setup.c
---- linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/board_setup.c  2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/hydrogen3/board_setup.c     2005-03-19 08:17:51.000000000 +0100
-@@ -51,12 +51,19 @@
+Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/hydrogen3/board_setup.c
++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c
+@@ -51,12 +51,19 @@ void board_reset (void)
   {
   }
   
@@ -2861,9 +2885,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/board_setup.c linux-2.4.32
   #ifdef CONFIG_AU1X00_USB_DEVICE
         // 2nd USB port is USB device
         pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/buttons.c linux-2.4.32-rc1.mips/arch/mips/au1000/hydrogen3/buttons.c
---- linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/buttons.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/hydrogen3/buttons.c 2005-02-11 22:09:55.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c
  @@ -0,0 +1,308 @@
  +/*
  + *  Copyright (C) 2003 Metrowerks, All Rights Reserved.
@@ -3173,10 +3198,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/buttons.c linux-2.4.32-rc1
  +
  +module_init(hydrogen3_buttons_init);
  +module_exit(hydrogen3_buttons_exit);
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/Makefile linux-2.4.32-rc1.mips/arch/mips/au1000/hydrogen3/Makefile
---- linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/Makefile       2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/hydrogen3/Makefile  2005-02-11 22:09:55.000000000 +0100
-@@ -14,6 +14,11 @@
+Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/hydrogen3/Makefile
++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile
+@@ -14,6 +14,11 @@ USE_STANDARD_AS_RULE := true
   
   O_TARGET := hydrogen3.o
   
@@ -3189,9 +3215,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/Makefile linux-2.4.32-rc1.
  +endif
   
   include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/mmc_support.c linux-2.4.32-rc1.mips/arch/mips/au1000/hydrogen3/mmc_support.c
---- linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/mmc_support.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/hydrogen3/mmc_support.c     2005-02-02 05:27:06.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c
  @@ -0,0 +1,89 @@
  +/*
  + * BRIEF MODULE DESCRIPTION
@@ -3282,9 +3309,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/hydrogen3/mmc_support.c linux-2.4.32
  +EXPORT_SYMBOL(mmc_power_on);
  +EXPORT_SYMBOL(mmc_power_off);
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/mtx-1/board_setup.c linux-2.4.32-rc1.mips/arch/mips/au1000/mtx-1/board_setup.c
---- linux-2.4.32-rc1/arch/mips/au1000/mtx-1/board_setup.c      2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/mtx-1/board_setup.c 2004-11-26 09:37:16.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/mtx-1/board_setup.c
++++ linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c
  @@ -48,6 +48,12 @@
   
   extern struct rtc_ops no_rtc_ops;
@@ -3298,10 +3326,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/mtx-1/board_setup.c linux-2.4.32-rc1
   void __init board_setup(void)
   {
         rtc_ops = &no_rtc_ops;
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/mtx-1/irqmap.c linux-2.4.32-rc1.mips/arch/mips/au1000/mtx-1/irqmap.c
---- linux-2.4.32-rc1/arch/mips/au1000/mtx-1/irqmap.c   2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/mtx-1/irqmap.c      2004-11-26 09:37:16.000000000 +0100
-@@ -72,10 +72,10 @@
+Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/mtx-1/irqmap.c
++++ linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c
+@@ -72,10 +72,10 @@ au1xxx_pci_irqmap(struct pci_dev *dev, u
          *      A       B       C       D
          */
         {
@@ -3316,10 +3345,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/mtx-1/irqmap.c linux-2.4.32-rc1.mips
         };
         const long min_idsel = 0, max_idsel = 3, irqs_per_slot = 4;
         return PCI_IRQ_TABLE_LOOKUP;
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1000/board_setup.c linux-2.4.32-rc1.mips/arch/mips/au1000/pb1000/board_setup.c
---- linux-2.4.32-rc1/arch/mips/au1000/pb1000/board_setup.c     2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1000/board_setup.c        2005-03-19 08:17:51.000000000 +0100
-@@ -58,6 +58,10 @@
+Index: linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/pb1000/board_setup.c
++++ linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c
+@@ -58,6 +58,10 @@ void board_reset (void)
   {
   }
   
@@ -3330,10 +3360,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1000/board_setup.c linux-2.4.32-rc
   void __init board_setup(void)
   {
         u32 pin_func, static_cfg0;
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1100/board_setup.c linux-2.4.32-rc1.mips/arch/mips/au1000/pb1100/board_setup.c
---- linux-2.4.32-rc1/arch/mips/au1000/pb1100/board_setup.c     2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1100/board_setup.c        2005-03-19 08:17:51.000000000 +0100
-@@ -62,6 +62,10 @@
+Index: linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/pb1100/board_setup.c
++++ linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c
+@@ -62,6 +62,10 @@ void board_reset (void)
       au_writel(0x00000000, 0xAE00001C);
   }
   
@@ -3344,10 +3375,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1100/board_setup.c linux-2.4.32-rc
   void __init board_setup(void)
   {
         u32 pin_func;
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1100/Makefile linux-2.4.32-rc1.mips/arch/mips/au1000/pb1100/Makefile
---- linux-2.4.32-rc1/arch/mips/au1000/pb1100/Makefile  2003-08-25 13:44:39.000000000 +0200
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1100/Makefile     2005-01-30 09:10:29.000000000 +0100
-@@ -16,4 +16,10 @@
+Index: linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/pb1100/Makefile
++++ linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile
+@@ -16,4 +16,10 @@ O_TARGET := pb1100.o
   
   obj-y := init.o board_setup.o irqmap.o
   
@@ -3358,9 +3390,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1100/Makefile linux-2.4.32-rc1.mip
  +endif
  +
   include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1100/mmc_support.c linux-2.4.32-rc1.mips/arch/mips/au1000/pb1100/mmc_support.c
---- linux-2.4.32-rc1/arch/mips/au1000/pb1100/mmc_support.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1100/mmc_support.c        2005-01-30 09:10:29.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c
  @@ -0,0 +1,126 @@
  +/*
  + * BRIEF MODULE DESCRIPTION
@@ -3488,9 +3521,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1100/mmc_support.c linux-2.4.32-rc
  +EXPORT_SYMBOL(mmc_power_on);
  +EXPORT_SYMBOL(mmc_power_off);
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1200/board_setup.c linux-2.4.32-rc1.mips/arch/mips/au1000/pb1200/board_setup.c
---- linux-2.4.32-rc1/arch/mips/au1000/pb1200/board_setup.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1200/board_setup.c        2005-03-19 08:17:51.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c
  @@ -0,0 +1,221 @@
  +/*
  + *
@@ -3713,9 +3747,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1200/board_setup.c linux-2.4.32-rc
  +      return 0;
  +}
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1200/init.c linux-2.4.32-rc1.mips/arch/mips/au1000/pb1200/init.c
---- linux-2.4.32-rc1/arch/mips/au1000/pb1200/init.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1200/init.c       2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/pb1200/init.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/pb1200/init.c
  @@ -0,0 +1,72 @@
  +/*
  + *
@@ -3789,9 +3824,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1200/init.c linux-2.4.32-rc1.mips/
  +      return 0;
  +}
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1200/irqmap.c linux-2.4.32-rc1.mips/arch/mips/au1000/pb1200/irqmap.c
---- linux-2.4.32-rc1/arch/mips/au1000/pb1200/irqmap.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1200/irqmap.c     2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c
  @@ -0,0 +1,180 @@
  +/*
  + * BRIEF MODULE DESCRIPTION
@@ -3973,9 +4009,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1200/irqmap.c linux-2.4.32-rc1.mip
  +      request of any source attached to the cascade */
  +}
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1200/Makefile linux-2.4.32-rc1.mips/arch/mips/au1000/pb1200/Makefile
---- linux-2.4.32-rc1/arch/mips/au1000/pb1200/Makefile  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1200/Makefile     2005-01-30 09:01:27.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile
  @@ -0,0 +1,25 @@
  +#
  +#  Copyright 2000 MontaVista Software Inc.
@@ -4002,9 +4039,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1200/Makefile linux-2.4.32-rc1.mip
  +
  +
  +include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1200/mmc_support.c linux-2.4.32-rc1.mips/arch/mips/au1000/pb1200/mmc_support.c
---- linux-2.4.32-rc1/arch/mips/au1000/pb1200/mmc_support.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1200/mmc_support.c        2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c
  @@ -0,0 +1,141 @@
  +/*
  + * BRIEF MODULE DESCRIPTION
@@ -4147,10 +4185,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1200/mmc_support.c linux-2.4.32-rc
  +EXPORT_SYMBOL(mmc_power_on);
  +EXPORT_SYMBOL(mmc_power_off);
  +
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1500/board_setup.c linux-2.4.32-rc1.mips/arch/mips/au1000/pb1500/board_setup.c
---- linux-2.4.32-rc1/arch/mips/au1000/pb1500/board_setup.c     2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1500/board_setup.c        2005-03-19 08:17:51.000000000 +0100
-@@ -62,6 +62,10 @@
+Index: linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/pb1500/board_setup.c
++++ linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c
+@@ -62,6 +62,10 @@ void board_reset (void)
       au_writel(0x00000000, 0xAE00001C);
   }
   
@@ -4161,9 +4200,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1500/board_setup.c linux-2.4.32-rc
   void __init board_setup(void)
   {
         u32 pin_func;
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1550/board_setup.c linux-2.4.32-rc1.mips/arch/mips/au1000/pb1550/board_setup.c
---- linux-2.4.32-rc1/arch/mips/au1000/pb1550/board_setup.c     2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1550/board_setup.c        2005-03-19 08:17:51.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/board_setup.c
++++ linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c
  @@ -48,12 +48,31 @@
   
   extern struct rtc_ops no_rtc_ops;
@@ -4196,7 +4236,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1550/board_setup.c linux-2.4.32-rc
   void __init board_setup(void)
   {
         u32 pin_func;
-@@ -78,5 +97,36 @@
+@@ -78,5 +97,36 @@ void __init board_setup(void)
         au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
         au_sync();
   
@@ -4233,9 +4273,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1550/board_setup.c linux-2.4.32-rc
  +#endif
         printk("AMD Alchemy Pb1550 Board\n");
   }
-diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1550/irqmap.c linux-2.4.32-rc1.mips/arch/mips/au1000/pb1550/irqmap.c
---- linux-2.4.32-rc1/arch/mips/au1000/pb1550/irqmap.c  2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/au1000/pb1550/irqmap.c     2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/irqmap.c
++++ linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c
  @@ -50,6 +50,9 @@
   au1xxx_irq_map_t au1xxx_irq_map[] = {
         { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 },
@@ -4246,10 +4287,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/au1000/pb1550/irqmap.c linux-2.4.32-rc1.mip
   };
   
   int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
-diff -Nur linux-2.4.32-rc1/arch/mips/config-shared.in linux-2.4.32-rc1.mips/arch/mips/config-shared.in
---- linux-2.4.32-rc1/arch/mips/config-shared.in        2005-01-19 15:09:27.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/config-shared.in   2005-01-30 09:01:26.000000000 +0100
-@@ -21,16 +21,19 @@
+Index: linux-2.4.35.4/arch/mips/config-shared.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/config-shared.in
++++ linux-2.4.35.4/arch/mips/config-shared.in
+@@ -21,16 +21,19 @@ mainmenu_option next_comment
   comment 'Machine selection'
   dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL
   dep_bool 'Support for Alchemy Bosporus board' CONFIG_MIPS_BOSPORUS $CONFIG_MIPS32
@@ -4270,7 +4312,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/config-shared.in linux-2.4.32-rc1.mips/arch
   dep_bool 'Support for MyCable XXS1500 board' CONFIG_MIPS_XXS1500 $CONFIG_MIPS32
   dep_bool 'Support for 4G Systems MTX-1 board' CONFIG_MIPS_MTX1 $CONFIG_MIPS32
   dep_bool 'Support for Cogent CSB250 board' CONFIG_COGENT_CSB250 $CONFIG_MIPS32
-@@ -249,6 +252,12 @@
+@@ -249,6 +252,12 @@ if [ "$CONFIG_MIPS_MIRAGE" = "y" ]; then
      define_bool CONFIG_PC_KEYB y
      define_bool CONFIG_NONCOHERENT_IO y
   fi
@@ -4283,7 +4325,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/config-shared.in linux-2.4.32-rc1.mips/arch
   if [ "$CONFIG_MIPS_BOSPORUS" = "y" ]; then
      define_bool CONFIG_SOC_AU1X00 y
      define_bool CONFIG_SOC_AU1500 y
-@@ -263,6 +272,12 @@
+@@ -263,6 +272,12 @@ if [ "$CONFIG_MIPS_PB1000" = "y" ]; then
      define_bool CONFIG_SWAP_IO_SPACE_W y
      define_bool CONFIG_SWAP_IO_SPACE_L y
   fi
@@ -4296,7 +4338,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/config-shared.in linux-2.4.32-rc1.mips/arch
   if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
      define_bool CONFIG_SOC_AU1X00 y
      define_bool CONFIG_SOC_AU1100 y
-@@ -271,9 +286,15 @@
+@@ -271,9 +286,15 @@ if [ "$CONFIG_MIPS_PB1100" = "y" ]; then
      define_bool CONFIG_SWAP_IO_SPACE_W y
      define_bool CONFIG_SWAP_IO_SPACE_L y
   fi
@@ -4314,7 +4356,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/config-shared.in linux-2.4.32-rc1.mips/arch
      define_bool CONFIG_NONCOHERENT_IO y
      define_bool CONFIG_PC_KEYB y
   fi
-@@ -290,18 +311,24 @@
+@@ -290,18 +311,24 @@ if [ "$CONFIG_MIPS_DB1500" = "y" ]; then
      define_bool CONFIG_NONCOHERENT_IO y
      define_bool CONFIG_PC_KEYB y
   fi
@@ -4342,7 +4384,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/config-shared.in linux-2.4.32-rc1.mips/arch
   fi
   if [ "$CONFIG_MIPS_HYDROGEN3" = "y" ]; then
      define_bool CONFIG_SOC_AU1X00 y
-@@ -327,12 +354,6 @@
+@@ -327,12 +354,6 @@ if [ "$CONFIG_COGENT_CSB250" = "y" ]; th
      define_bool CONFIG_NONCOHERENT_IO y
      define_bool CONFIG_PC_KEYB y
   fi
@@ -4355,7 +4397,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/config-shared.in linux-2.4.32-rc1.mips/arch
   if [ "$CONFIG_MIPS_COBALT" = "y" ]; then
      define_bool CONFIG_BOOT_ELF32 y
      define_bool CONFIG_COBALT_LCD y
-@@ -729,6 +750,13 @@
+@@ -729,6 +750,13 @@ if [ "$CONFIG_ACER_PICA_61" = "y" -o \
        "$CONFIG_MIPS_PB1000" = "y" -o \
        "$CONFIG_MIPS_PB1100" = "y" -o \
        "$CONFIG_MIPS_PB1500" = "y" -o \
@@ -4369,10 +4411,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/config-shared.in linux-2.4.32-rc1.mips/arch
        "$CONFIG_NEC_OSPREY" = "y" -o \
        "$CONFIG_NEC_EAGLE" = "y" -o \
        "$CONFIG_NINO" = "y" -o \
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig linux-2.4.32-rc1.mips/arch/mips/defconfig
---- linux-2.4.32-rc1/arch/mips/defconfig       2005-01-19 15:09:27.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig  2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig
++++ linux-2.4.35.4/arch/mips/defconfig
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -4382,7 +4425,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig linux-2.4.32-rc1.mips/arch/mips/d
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -235,11 +235,6 @@
+@@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -4394,7 +4437,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig linux-2.4.32-rc1.mips/arch/mips/d
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -319,9 +314,11 @@
+@@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -4406,7 +4449,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig linux-2.4.32-rc1.mips/arch/mips/d
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -465,7 +462,6 @@
+@@ -465,7 +462,6 @@ CONFIG_VT_CONSOLE=y
   # CONFIG_SERIAL is not set
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -4414,10 +4457,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig linux-2.4.32-rc1.mips/arch/mips/d
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-atlas linux-2.4.32-rc1.mips/arch/mips/defconfig-atlas
---- linux-2.4.32-rc1/arch/mips/defconfig-atlas 2005-01-19 15:09:27.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-atlas    2005-03-18 13:13:21.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-atlas
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-atlas
++++ linux-2.4.35.4/arch/mips/defconfig-atlas
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -4427,7 +4471,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-atlas linux-2.4.32-rc1.mips/arch/
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -235,11 +235,6 @@
+@@ -235,11 +235,6 @@ CONFIG_IP_PNP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -4439,7 +4483,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-atlas linux-2.4.32-rc1.mips/arch/
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -317,9 +312,11 @@
+@@ -317,9 +312,11 @@ CONFIG_SD_EXTRA_DEVS=40
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -4451,7 +4495,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-atlas linux-2.4.32-rc1.mips/arch/
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -528,7 +525,6 @@
+@@ -528,7 +525,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -4459,10 +4503,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-atlas linux-2.4.32-rc1.mips/arch/
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-bosporus linux-2.4.32-rc1.mips/arch/mips/defconfig-bosporus
---- linux-2.4.32-rc1/arch/mips/defconfig-bosporus      2005-01-19 15:09:27.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-bosporus 2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-bosporus
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-bosporus
++++ linux-2.4.35.4/arch/mips/defconfig-bosporus
+@@ -30,8 +30,8 @@ CONFIG_MIPS_BOSPORUS=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -4472,7 +4517,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-bosporus linux-2.4.32-rc1.mips/ar
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -208,9 +208,7 @@
+@@ -208,9 +208,7 @@ CONFIG_MTD_CFI_AMDSTD=y
   CONFIG_MTD_BOSPORUS=y
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -4482,7 +4527,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-bosporus linux-2.4.32-rc1.mips/ar
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -229,7 +227,6 @@
+@@ -229,7 +227,6 @@ CONFIG_MTD_BOSPORUS=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -4490,7 +4535,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-bosporus linux-2.4.32-rc1.mips/ar
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -373,11 +370,6 @@
+@@ -373,11 +370,6 @@ CONFIG_IP_NF_MANGLE=m
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -4502,7 +4547,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-bosporus linux-2.4.32-rc1.mips/ar
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -457,9 +449,11 @@
+@@ -457,9 +449,11 @@ CONFIG_SCSI_CONSTANTS=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -4514,7 +4559,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-bosporus linux-2.4.32-rc1.mips/ar
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -681,7 +675,6 @@
+@@ -681,7 +675,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -4522,10 +4567,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-bosporus linux-2.4.32-rc1.mips/ar
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-capcella linux-2.4.32-rc1.mips/arch/mips/defconfig-capcella
---- linux-2.4.32-rc1/arch/mips/defconfig-capcella      2005-01-19 15:09:27.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-capcella 2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-capcella
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-capcella
++++ linux-2.4.35.4/arch/mips/defconfig-capcella
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -4535,7 +4581,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-capcella linux-2.4.32-rc1.mips/ar
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -228,11 +228,6 @@
+@@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -4547,7 +4593,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-capcella linux-2.4.32-rc1.mips/ar
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -472,7 +467,6 @@
+@@ -472,7 +467,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -4555,10 +4601,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-capcella linux-2.4.32-rc1.mips/ar
   # CONFIG_VR41XX_KIU is not set
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-cobalt linux-2.4.32-rc1.mips/arch/mips/defconfig-cobalt
---- linux-2.4.32-rc1/arch/mips/defconfig-cobalt        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-cobalt   2005-03-18 13:13:21.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-cobalt
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-cobalt
++++ linux-2.4.35.4/arch/mips/defconfig-cobalt
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -4568,7 +4615,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-cobalt linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -222,11 +222,6 @@
+@@ -222,11 +222,6 @@ CONFIG_INET=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -4580,7 +4627,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-cobalt linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -505,7 +500,6 @@
+@@ -505,7 +500,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -4588,10 +4635,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-cobalt linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=16
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-csb250 linux-2.4.32-rc1.mips/arch/mips/defconfig-csb250
---- linux-2.4.32-rc1/arch/mips/defconfig-csb250        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-csb250   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-csb250
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-csb250
++++ linux-2.4.35.4/arch/mips/defconfig-csb250
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -4601,7 +4649,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-csb250 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   CONFIG_COGENT_CSB250=y
-@@ -268,11 +268,6 @@
+@@ -268,11 +268,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -4613,7 +4661,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-csb250 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -556,7 +551,6 @@
+@@ -556,7 +551,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -4621,10 +4669,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-csb250 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1000 linux-2.4.32-rc1.mips/arch/mips/defconfig-db1000
---- linux-2.4.32-rc1/arch/mips/defconfig-db1000        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-db1000   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-db1000
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-db1000
++++ linux-2.4.35.4/arch/mips/defconfig-db1000
+@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1000=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -4634,7 +4683,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1000 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -214,11 +214,7 @@
+@@ -214,11 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -4646,7 +4695,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1000 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -237,7 +233,6 @@
+@@ -237,7 +233,6 @@ CONFIG_MTD_DB1X00_USER=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -4654,7 +4703,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1000 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -342,11 +337,6 @@
+@@ -342,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -4666,7 +4715,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1000 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -636,7 +626,6 @@
+@@ -636,7 +626,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -4674,10 +4723,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1000 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1100 linux-2.4.32-rc1.mips/arch/mips/defconfig-db1100
---- linux-2.4.32-rc1/arch/mips/defconfig-db1100        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-db1100   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-db1100
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-db1100
++++ linux-2.4.35.4/arch/mips/defconfig-db1100
+@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1100=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -4687,7 +4737,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -214,11 +214,7 @@
+@@ -214,11 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -4699,7 +4749,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -237,7 +233,6 @@
+@@ -237,7 +233,6 @@ CONFIG_MTD_DB1X00_USER=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -4707,7 +4757,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -342,11 +337,6 @@
+@@ -342,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -4719,7 +4769,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -636,7 +626,6 @@
+@@ -636,7 +626,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -4727,7 +4777,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1100 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-@@ -884,6 +873,7 @@
+@@ -884,6 +873,7 @@ CONFIG_DUMMY_CONSOLE=y
   # CONFIG_FB_PM2 is not set
   # CONFIG_FB_PM3 is not set
   # CONFIG_FB_CYBER2000 is not set
@@ -4735,7 +4785,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_FB_MATROX is not set
   # CONFIG_FB_ATY is not set
   # CONFIG_FB_RADEON is not set
-@@ -895,7 +885,6 @@
+@@ -895,7 +885,6 @@ CONFIG_DUMMY_CONSOLE=y
   # CONFIG_FB_VOODOO1 is not set
   # CONFIG_FB_TRIDENT is not set
   # CONFIG_FB_E1356 is not set
@@ -4743,9 +4793,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_FB_IT8181 is not set
   # CONFIG_FB_VIRTUAL is not set
   CONFIG_FBCON_ADVANCED=y
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1200 linux-2.4.32-rc1.mips/arch/mips/defconfig-db1200
---- linux-2.4.32-rc1/arch/mips/defconfig-db1200        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-db1200   2005-03-18 13:13:21.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/defconfig-db1200
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/defconfig-db1200
  @@ -0,0 +1,1032 @@
  +#
  +# Automatically generated make config: don't edit
@@ -5779,10 +5830,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1200 linux-2.4.32-rc1.mips/arch
  +CONFIG_ZLIB_INFLATE=m
  +CONFIG_ZLIB_DEFLATE=m
  +# CONFIG_FW_LOADER is not set
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1500 linux-2.4.32-rc1.mips/arch/mips/defconfig-db1500
---- linux-2.4.32-rc1/arch/mips/defconfig-db1500        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-db1500   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-db1500
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-db1500
++++ linux-2.4.35.4/arch/mips/defconfig-db1500
+@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1500=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -5792,7 +5844,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1500 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -267,11 +267,6 @@
+@@ -267,11 +267,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -5804,7 +5856,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1500 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -555,7 +550,6 @@
+@@ -555,7 +550,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -5812,10 +5864,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1500 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1550 linux-2.4.32-rc1.mips/arch/mips/defconfig-db1550
---- linux-2.4.32-rc1/arch/mips/defconfig-db1550        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-db1550   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-db1550
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-db1550
++++ linux-2.4.35.4/arch/mips/defconfig-db1550
+@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1550=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -5825,7 +5878,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1550 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -213,11 +213,9 @@
+@@ -213,11 +213,9 @@ CONFIG_MTD_CFI_AMDSTD=y
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -5837,7 +5890,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1550 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -236,7 +234,6 @@
+@@ -236,7 +234,6 @@ CONFIG_MTD_PB1550_USER=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -5845,7 +5898,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1550 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -343,11 +340,6 @@
+@@ -343,11 +340,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -5857,7 +5910,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1550 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -633,7 +625,6 @@
+@@ -633,7 +625,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -5865,10 +5918,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-db1550 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ddb5476 linux-2.4.32-rc1.mips/arch/mips/defconfig-ddb5476
---- linux-2.4.32-rc1/arch/mips/defconfig-ddb5476       2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-ddb5476  2005-03-18 13:13:21.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5476
++++ linux-2.4.35.4/arch/mips/defconfig-ddb5476
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -5878,7 +5932,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ddb5476 linux-2.4.32-rc1.mips/arc
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -226,11 +226,6 @@
+@@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -5890,7 +5944,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ddb5476 linux-2.4.32-rc1.mips/arc
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -517,7 +512,6 @@
+@@ -517,7 +512,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -5898,10 +5952,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ddb5476 linux-2.4.32-rc1.mips/arc
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ddb5477 linux-2.4.32-rc1.mips/arch/mips/defconfig-ddb5477
---- linux-2.4.32-rc1/arch/mips/defconfig-ddb5477       2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-ddb5477  2005-03-18 13:13:21.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5477
++++ linux-2.4.35.4/arch/mips/defconfig-ddb5477
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -5911,7 +5966,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ddb5477 linux-2.4.32-rc1.mips/arc
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -226,11 +226,6 @@
+@@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -5923,7 +5978,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ddb5477 linux-2.4.32-rc1.mips/arc
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -434,7 +429,6 @@
+@@ -434,7 +429,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -5931,10 +5986,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ddb5477 linux-2.4.32-rc1.mips/arc
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-decstation linux-2.4.32-rc1.mips/arch/mips/defconfig-decstation
---- linux-2.4.32-rc1/arch/mips/defconfig-decstation    2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-decstation       2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-decstation
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-decstation
++++ linux-2.4.35.4/arch/mips/defconfig-decstation
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -5944,7 +6000,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-decstation linux-2.4.32-rc1.mips/
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -223,11 +223,6 @@
+@@ -223,11 +223,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -5956,7 +6012,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-decstation linux-2.4.32-rc1.mips/
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -306,9 +301,11 @@
+@@ -306,9 +301,11 @@ CONFIG_SCSI_DECNCR=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -5968,7 +6024,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-decstation linux-2.4.32-rc1.mips/
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -477,7 +474,6 @@
+@@ -477,7 +474,6 @@ CONFIG_SERIAL_DEC=y
   CONFIG_SERIAL_DEC_CONSOLE=y
   CONFIG_DZ=y
   CONFIG_ZS=y
@@ -5976,10 +6032,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-decstation linux-2.4.32-rc1.mips/
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-e55 linux-2.4.32-rc1.mips/arch/mips/defconfig-e55
---- linux-2.4.32-rc1/arch/mips/defconfig-e55   2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-e55      2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-e55
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-e55
++++ linux-2.4.35.4/arch/mips/defconfig-e55
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -5989,7 +6046,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-e55 linux-2.4.32-rc1.mips/arch/mi
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -222,11 +222,6 @@
+@@ -222,11 +222,6 @@ CONFIG_IP_MULTICAST=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -6001,7 +6058,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-e55 linux-2.4.32-rc1.mips/arch/mi
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -426,7 +421,6 @@
+@@ -426,7 +421,6 @@ CONFIG_SERIAL_MANY_PORTS=y
   # CONFIG_SERIAL_MULTIPORT is not set
   # CONFIG_HUB6 is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -6009,10 +6066,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-e55 linux-2.4.32-rc1.mips/arch/mi
   # CONFIG_VR41XX_KIU is not set
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-eagle linux-2.4.32-rc1.mips/arch/mips/defconfig-eagle
---- linux-2.4.32-rc1/arch/mips/defconfig-eagle 2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-eagle    2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-eagle
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-eagle
++++ linux-2.4.35.4/arch/mips/defconfig-eagle
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -6022,7 +6080,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-eagle linux-2.4.32-rc1.mips/arch/
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -208,8 +208,8 @@
+@@ -208,8 +208,8 @@ CONFIG_MTD_CFI_INTELEXT=y
   # Mapping drivers for chip access
   #
   CONFIG_MTD_PHYSMAP=y
@@ -6033,7 +6091,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-eagle linux-2.4.32-rc1.mips/arch/
   CONFIG_MTD_PHYSMAP_BUSWIDTH=4
   # CONFIG_MTD_PB1000 is not set
   # CONFIG_MTD_PB1500 is not set
-@@ -217,9 +217,7 @@
+@@ -217,9 +217,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -6043,7 +6101,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-eagle linux-2.4.32-rc1.mips/arch/
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -238,7 +236,6 @@
+@@ -238,7 +236,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
   #
   # Disk-On-Chip Device Drivers
   #
@@ -6051,7 +6109,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-eagle linux-2.4.32-rc1.mips/arch/
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -327,11 +324,6 @@
+@@ -327,11 +324,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -6063,7 +6121,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-eagle linux-2.4.32-rc1.mips/arch/
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -587,7 +579,6 @@
+@@ -587,7 +579,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -6071,10 +6129,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-eagle linux-2.4.32-rc1.mips/arch/
   # CONFIG_VR41XX_KIU is not set
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ev64120 linux-2.4.32-rc1.mips/arch/mips/defconfig-ev64120
---- linux-2.4.32-rc1/arch/mips/defconfig-ev64120       2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-ev64120  2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-ev64120
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ev64120
++++ linux-2.4.35.4/arch/mips/defconfig-ev64120
+@@ -30,8 +30,8 @@ CONFIG_MODULES=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -6084,7 +6143,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ev64120 linux-2.4.32-rc1.mips/arc
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -230,11 +230,6 @@
+@@ -230,11 +230,6 @@ CONFIG_IP_PNP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -6096,7 +6155,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ev64120 linux-2.4.32-rc1.mips/arc
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -443,7 +438,6 @@
+@@ -443,7 +438,6 @@ CONFIG_SERIAL=y
   # CONFIG_SERIAL_CONSOLE is not set
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -6104,10 +6163,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ev64120 linux-2.4.32-rc1.mips/arc
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ev96100 linux-2.4.32-rc1.mips/arch/mips/defconfig-ev96100
---- linux-2.4.32-rc1/arch/mips/defconfig-ev96100       2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-ev96100  2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-ev96100
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ev96100
++++ linux-2.4.35.4/arch/mips/defconfig-ev96100
+@@ -30,8 +30,8 @@ CONFIG_MODULES=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -6117,7 +6177,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ev96100 linux-2.4.32-rc1.mips/arc
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -232,11 +232,6 @@
+@@ -232,11 +232,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -6129,7 +6189,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ev96100 linux-2.4.32-rc1.mips/arc
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -441,7 +436,6 @@
+@@ -441,7 +436,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -6137,9 +6197,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ev96100 linux-2.4.32-rc1.mips/arc
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ficmmp linux-2.4.32-rc1.mips/arch/mips/defconfig-ficmmp
---- linux-2.4.32-rc1/arch/mips/defconfig-ficmmp        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-ficmmp   2005-03-18 13:13:21.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/defconfig-ficmmp
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/defconfig-ficmmp
  @@ -0,0 +1,862 @@
  +#
  +# Automatically generated make config: don't edit
@@ -7003,10 +7064,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ficmmp linux-2.4.32-rc1.mips/arch
  +# CONFIG_CRC32 is not set
  +CONFIG_ZLIB_INFLATE=m
  +CONFIG_ZLIB_DEFLATE=m
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hp-lj linux-2.4.32-rc1.mips/arch/mips/defconfig-hp-lj
---- linux-2.4.32-rc1/arch/mips/defconfig-hp-lj 2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-hp-lj    2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-hp-lj
++++ linux-2.4.35.4/arch/mips/defconfig-hp-lj
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7016,7 +7078,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hp-lj linux-2.4.32-rc1.mips/arch/
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -184,8 +184,8 @@
+@@ -184,8 +184,8 @@ CONFIG_MTD_CFI_AMDSTD=y
   # Mapping drivers for chip access
   #
   CONFIG_MTD_PHYSMAP=y
@@ -7027,7 +7089,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hp-lj linux-2.4.32-rc1.mips/arch/
   CONFIG_MTD_PHYSMAP_BUSWIDTH=4
   # CONFIG_MTD_PB1000 is not set
   # CONFIG_MTD_PB1500 is not set
-@@ -193,9 +193,7 @@
+@@ -193,9 +193,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -7037,7 +7099,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hp-lj linux-2.4.32-rc1.mips/arch/
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -214,7 +212,6 @@
+@@ -214,7 +212,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
   #
   # Disk-On-Chip Device Drivers
   #
@@ -7045,7 +7107,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hp-lj linux-2.4.32-rc1.mips/arch/
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -304,11 +301,6 @@
+@@ -304,11 +301,6 @@ CONFIG_IP_PNP_DHCP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7057,7 +7119,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hp-lj linux-2.4.32-rc1.mips/arch/
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -604,7 +596,6 @@
+@@ -604,7 +596,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -7065,10 +7127,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hp-lj linux-2.4.32-rc1.mips/arch/
   # CONFIG_UNIX98_PTYS is not set
   
   #
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hydrogen3 linux-2.4.32-rc1.mips/arch/mips/defconfig-hydrogen3
---- linux-2.4.32-rc1/arch/mips/defconfig-hydrogen3     2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-hydrogen3        2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-hydrogen3
++++ linux-2.4.35.4/arch/mips/defconfig-hydrogen3
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7078,7 +7141,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hydrogen3 linux-2.4.32-rc1.mips/a
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -214,9 +214,7 @@
+@@ -214,9 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -7088,7 +7151,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hydrogen3 linux-2.4.32-rc1.mips/a
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -235,7 +233,6 @@
+@@ -235,7 +233,6 @@ CONFIG_MTD_HYDROGEN3=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -7096,7 +7159,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hydrogen3 linux-2.4.32-rc1.mips/a
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -340,11 +337,6 @@
+@@ -340,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7108,7 +7171,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hydrogen3 linux-2.4.32-rc1.mips/a
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -590,7 +582,6 @@
+@@ -590,7 +582,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -7116,7 +7179,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hydrogen3 linux-2.4.32-rc1.mips/a
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-@@ -838,6 +829,7 @@
+@@ -838,6 +829,7 @@ CONFIG_DUMMY_CONSOLE=y
   # CONFIG_FB_PM2 is not set
   # CONFIG_FB_PM3 is not set
   # CONFIG_FB_CYBER2000 is not set
@@ -7124,7 +7187,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hydrogen3 linux-2.4.32-rc1.mips/a
   # CONFIG_FB_MATROX is not set
   # CONFIG_FB_ATY is not set
   # CONFIG_FB_RADEON is not set
-@@ -849,7 +841,6 @@
+@@ -849,7 +841,6 @@ CONFIG_DUMMY_CONSOLE=y
   # CONFIG_FB_VOODOO1 is not set
   # CONFIG_FB_TRIDENT is not set
   # CONFIG_FB_E1356 is not set
@@ -7132,10 +7195,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-hydrogen3 linux-2.4.32-rc1.mips/a
   # CONFIG_FB_IT8181 is not set
   # CONFIG_FB_VIRTUAL is not set
   CONFIG_FBCON_ADVANCED=y
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ip22 linux-2.4.32-rc1.mips/arch/mips/defconfig-ip22
---- linux-2.4.32-rc1/arch/mips/defconfig-ip22  2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-ip22     2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-ip22
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ip22
++++ linux-2.4.35.4/arch/mips/defconfig-ip22
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7145,7 +7209,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ip22 linux-2.4.32-rc1.mips/arch/m
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -235,11 +235,6 @@
+@@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7157,7 +7221,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ip22 linux-2.4.32-rc1.mips/arch/m
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -319,9 +314,11 @@
+@@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -7169,7 +7233,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ip22 linux-2.4.32-rc1.mips/arch/m
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -465,7 +462,6 @@
+@@ -465,7 +462,6 @@ CONFIG_VT_CONSOLE=y
   # CONFIG_SERIAL is not set
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -7177,10 +7241,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ip22 linux-2.4.32-rc1.mips/arch/m
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-it8172 linux-2.4.32-rc1.mips/arch/mips/defconfig-it8172
---- linux-2.4.32-rc1/arch/mips/defconfig-it8172        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-it8172   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-it8172
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-it8172
++++ linux-2.4.35.4/arch/mips/defconfig-it8172
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7190,7 +7255,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-it8172 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -186,8 +186,8 @@
+@@ -186,8 +186,8 @@ CONFIG_MTD_CFI_INTELEXT=y
   # Mapping drivers for chip access
   #
   CONFIG_MTD_PHYSMAP=y
@@ -7201,7 +7266,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-it8172 linux-2.4.32-rc1.mips/arch
   CONFIG_MTD_PHYSMAP_BUSWIDTH=4
   # CONFIG_MTD_PB1000 is not set
   # CONFIG_MTD_PB1500 is not set
-@@ -195,9 +195,7 @@
+@@ -195,9 +195,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -7211,7 +7276,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-it8172 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -216,7 +214,6 @@
+@@ -216,7 +214,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
   #
   # Disk-On-Chip Device Drivers
   #
@@ -7219,7 +7284,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-it8172 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -304,11 +301,6 @@
+@@ -304,11 +301,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7231,7 +7296,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-it8172 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -592,7 +584,6 @@
+@@ -592,7 +584,6 @@ CONFIG_SERIAL_CONSOLE=y
   CONFIG_PC_KEYB=y
   # CONFIG_IT8172_SCR0 is not set
   # CONFIG_IT8172_SCR1 is not set
@@ -7239,10 +7304,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-it8172 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ivr linux-2.4.32-rc1.mips/arch/mips/defconfig-ivr
---- linux-2.4.32-rc1/arch/mips/defconfig-ivr   2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-ivr      2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-ivr
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ivr
++++ linux-2.4.35.4/arch/mips/defconfig-ivr
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7252,7 +7318,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ivr linux-2.4.32-rc1.mips/arch/mi
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -226,11 +226,6 @@
+@@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7264,7 +7330,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ivr linux-2.4.32-rc1.mips/arch/mi
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -516,7 +511,6 @@
+@@ -516,7 +511,6 @@ CONFIG_SERIAL_CONSOLE=y
   CONFIG_QTRONIX_KEYBOARD=y
   CONFIG_IT8172_CIR=y
   # CONFIG_IT8172_SCR0 is not set
@@ -7272,10 +7338,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ivr linux-2.4.32-rc1.mips/arch/mi
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-jmr3927 linux-2.4.32-rc1.mips/arch/mips/defconfig-jmr3927
---- linux-2.4.32-rc1/arch/mips/defconfig-jmr3927       2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-jmr3927  2005-03-18 13:13:21.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-jmr3927
++++ linux-2.4.35.4/arch/mips/defconfig-jmr3927
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7285,7 +7352,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-jmr3927 linux-2.4.32-rc1.mips/arc
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -225,11 +225,6 @@
+@@ -225,11 +225,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7297,7 +7364,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-jmr3927 linux-2.4.32-rc1.mips/arc
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -454,7 +449,6 @@
+@@ -454,7 +449,6 @@ CONFIG_SERIAL_NONSTANDARD=y
   # CONFIG_SERIAL_TXX9_CONSOLE is not set
   CONFIG_TXX927_SERIAL=y
   CONFIG_TXX927_SERIAL_CONSOLE=y
@@ -7305,10 +7372,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-jmr3927 linux-2.4.32-rc1.mips/arc
   # CONFIG_UNIX98_PTYS is not set
   
   #
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-lasat linux-2.4.32-rc1.mips/arch/mips/defconfig-lasat
---- linux-2.4.32-rc1/arch/mips/defconfig-lasat 2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-lasat    2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-lasat
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-lasat
++++ linux-2.4.35.4/arch/mips/defconfig-lasat
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7318,7 +7386,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-lasat linux-2.4.32-rc1.mips/arch/
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -198,9 +198,7 @@
+@@ -198,9 +198,7 @@ CONFIG_MTD_CFI_AMDSTD=y
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -7328,7 +7396,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-lasat linux-2.4.32-rc1.mips/arch/
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -219,7 +217,6 @@
+@@ -219,7 +217,6 @@ CONFIG_MTD_LASAT=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -7336,7 +7404,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-lasat linux-2.4.32-rc1.mips/arch/
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -303,11 +300,6 @@
+@@ -303,11 +300,6 @@ CONFIG_INET=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7348,7 +7416,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-lasat linux-2.4.32-rc1.mips/arch/
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -584,7 +576,6 @@
+@@ -584,7 +576,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -7356,10 +7424,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-lasat linux-2.4.32-rc1.mips/arch/
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-malta linux-2.4.32-rc1.mips/arch/mips/defconfig-malta
---- linux-2.4.32-rc1/arch/mips/defconfig-malta 2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-malta    2005-04-19 14:19:34.000000000 +0200
-@@ -22,16 +22,19 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-malta
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-malta
++++ linux-2.4.35.4/arch/mips/defconfig-malta
+@@ -22,16 +22,19 @@ CONFIG_KMOD=y
   #
   # CONFIG_ACER_PICA_61 is not set
   # CONFIG_MIPS_BOSPORUS is not set
@@ -7380,7 +7449,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-malta linux-2.4.32-rc1.mips/arch/
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -237,11 +240,6 @@
+@@ -237,11 +240,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7392,7 +7461,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-malta linux-2.4.32-rc1.mips/arch/
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -273,8 +271,83 @@
+@@ -273,8 +271,83 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # ATA/IDE/MFM/RLL support
   #
@@ -7477,7 +7546,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-malta linux-2.4.32-rc1.mips/arch/
   
   #
   # SCSI support
-@@ -319,9 +392,11 @@
+@@ -319,9 +392,11 @@ CONFIG_SD_EXTRA_DEVS=40
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -7489,7 +7558,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-malta linux-2.4.32-rc1.mips/arch/
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -524,7 +599,6 @@
+@@ -524,7 +599,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -7497,10 +7566,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-malta linux-2.4.32-rc1.mips/arch/
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mirage linux-2.4.32-rc1.mips/arch/mips/defconfig-mirage
---- linux-2.4.32-rc1/arch/mips/defconfig-mirage        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-mirage   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-mirage
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-mirage
++++ linux-2.4.35.4/arch/mips/defconfig-mirage
+@@ -30,8 +30,8 @@ CONFIG_MIPS_MIRAGE=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7510,7 +7580,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mirage linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -209,9 +209,7 @@
+@@ -209,9 +209,7 @@ CONFIG_MTD_CFI_AMDSTD=y
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -7520,7 +7590,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mirage linux-2.4.32-rc1.mips/arch
   CONFIG_MTD_MIRAGE=y
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -230,7 +228,6 @@
+@@ -230,7 +228,6 @@ CONFIG_MTD_MIRAGE=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -7528,7 +7598,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mirage linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -335,11 +332,6 @@
+@@ -335,11 +332,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7540,7 +7610,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mirage linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -560,7 +552,6 @@
+@@ -560,7 +552,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -7548,10 +7618,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mirage linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mpc30x linux-2.4.32-rc1.mips/arch/mips/defconfig-mpc30x
---- linux-2.4.32-rc1/arch/mips/defconfig-mpc30x        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-mpc30x   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-mpc30x
++++ linux-2.4.35.4/arch/mips/defconfig-mpc30x
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7561,7 +7632,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mpc30x linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -228,11 +228,6 @@
+@@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7573,7 +7644,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mpc30x linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -400,7 +395,6 @@
+@@ -400,7 +395,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -7581,10 +7652,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mpc30x linux-2.4.32-rc1.mips/arch
   # CONFIG_VR41XX_KIU is not set
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mtx-1 linux-2.4.32-rc1.mips/arch/mips/defconfig-mtx-1
---- linux-2.4.32-rc1/arch/mips/defconfig-mtx-1 2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-mtx-1    2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-mtx-1
++++ linux-2.4.35.4/arch/mips/defconfig-mtx-1
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7594,7 +7666,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mtx-1 linux-2.4.32-rc1.mips/arch/
   # CONFIG_MIPS_XXS1500 is not set
   CONFIG_MIPS_MTX1=y
   # CONFIG_COGENT_CSB250 is not set
-@@ -193,9 +193,7 @@
+@@ -193,9 +193,7 @@ CONFIG_MTD_CFI_AMDSTD=y
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   CONFIG_MTD_MTX1=y
@@ -7604,7 +7676,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mtx-1 linux-2.4.32-rc1.mips/arch/
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -214,7 +212,6 @@
+@@ -214,7 +212,6 @@ CONFIG_MTD_MTX1=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -7612,7 +7684,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mtx-1 linux-2.4.32-rc1.mips/arch/
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -371,11 +368,6 @@
+@@ -371,11 +368,6 @@ CONFIG_VLAN_8021Q=m
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7624,7 +7696,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mtx-1 linux-2.4.32-rc1.mips/arch/
   # CONFIG_DECNET is not set
   CONFIG_BRIDGE=m
   # CONFIG_X25 is not set
-@@ -479,9 +471,11 @@
+@@ -479,9 +471,11 @@ CONFIG_SR_EXTRA_DEVS=2
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -7636,7 +7708,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mtx-1 linux-2.4.32-rc1.mips/arch/
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -700,7 +694,6 @@
+@@ -700,7 +694,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -7644,10 +7716,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-mtx-1 linux-2.4.32-rc1.mips/arch/
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-nino linux-2.4.32-rc1.mips/arch/mips/defconfig-nino
---- linux-2.4.32-rc1/arch/mips/defconfig-nino  2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-nino     2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-nino
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-nino
++++ linux-2.4.35.4/arch/mips/defconfig-nino
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7657,7 +7730,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-nino linux-2.4.32-rc1.mips/arch/m
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -226,11 +226,6 @@
+@@ -226,11 +226,6 @@ CONFIG_INET=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7669,7 +7742,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-nino linux-2.4.32-rc1.mips/arch/m
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -339,7 +334,6 @@
+@@ -339,7 +334,6 @@ CONFIG_SERIAL_TX3912_CONSOLE=y
   # CONFIG_SERIAL_TXX9 is not set
   # CONFIG_SERIAL_TXX9_CONSOLE is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -7677,10 +7750,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-nino linux-2.4.32-rc1.mips/arch/m
   # CONFIG_UNIX98_PTYS is not set
   
   #
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ocelot linux-2.4.32-rc1.mips/arch/mips/defconfig-ocelot
---- linux-2.4.32-rc1/arch/mips/defconfig-ocelot        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-ocelot   2005-03-18 13:13:21.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-ocelot
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ocelot
++++ linux-2.4.35.4/arch/mips/defconfig-ocelot
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7690,7 +7764,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ocelot linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -194,9 +194,7 @@
+@@ -194,9 +194,7 @@ CONFIG_MTD_JEDEC=y
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -7700,7 +7774,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ocelot linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   CONFIG_MTD_OCELOT=y
-@@ -215,7 +213,6 @@
+@@ -215,7 +213,6 @@ CONFIG_MTD_OCELOT=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -7708,7 +7782,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ocelot linux-2.4.32-rc1.mips/arch
   CONFIG_MTD_DOC2000=y
   # CONFIG_MTD_DOC2001 is not set
   CONFIG_MTD_DOCPROBE=y
-@@ -307,11 +304,6 @@
+@@ -307,11 +304,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7720,7 +7794,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ocelot linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -513,7 +505,6 @@
+@@ -513,7 +505,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -7728,10 +7802,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ocelot linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-osprey linux-2.4.32-rc1.mips/arch/mips/defconfig-osprey
---- linux-2.4.32-rc1/arch/mips/defconfig-osprey        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-osprey   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-osprey
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-osprey
++++ linux-2.4.35.4/arch/mips/defconfig-osprey
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7741,7 +7816,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-osprey linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -227,11 +227,6 @@
+@@ -227,11 +227,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7753,7 +7828,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-osprey linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -388,7 +383,6 @@
+@@ -388,7 +383,6 @@ CONFIG_SERIAL_MANY_PORTS=y
   # CONFIG_SERIAL_MULTIPORT is not set
   # CONFIG_HUB6 is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -7761,10 +7836,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-osprey linux-2.4.32-rc1.mips/arch
   # CONFIG_VR41XX_KIU is not set
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1000 linux-2.4.32-rc1.mips/arch/mips/defconfig-pb1000
---- linux-2.4.32-rc1/arch/mips/defconfig-pb1000        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-pb1000   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-pb1000
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1000
++++ linux-2.4.35.4/arch/mips/defconfig-pb1000
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   CONFIG_MIPS_PB1000=y
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -7774,7 +7850,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1000 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -215,9 +215,7 @@
+@@ -215,9 +215,7 @@ CONFIG_MTD_PB1000=y
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -7784,7 +7860,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1000 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -236,7 +234,6 @@
+@@ -236,7 +234,6 @@ CONFIG_MTD_PB1000=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -7792,7 +7868,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1000 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -324,11 +321,6 @@
+@@ -324,11 +321,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7804,7 +7880,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1000 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -622,7 +614,6 @@
+@@ -622,7 +614,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -7812,7 +7888,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1000 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-@@ -707,7 +698,7 @@
+@@ -707,7 +698,7 @@ CONFIG_UNIX98_PTY_COUNT=256
   #
   # CONFIG_PCMCIA_SERIAL_CS is not set
   # CONFIG_SYNCLINK_CS is not set
@@ -7821,10 +7897,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1000 linux-2.4.32-rc1.mips/arch
   # CONFIG_TS_AU1X00_ADS7846 is not set
   
   #
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1100 linux-2.4.32-rc1.mips/arch/mips/defconfig-pb1100
---- linux-2.4.32-rc1/arch/mips/defconfig-pb1100        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-pb1100   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-pb1100
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1100
++++ linux-2.4.35.4/arch/mips/defconfig-pb1100
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   CONFIG_MIPS_PB1100=y
   # CONFIG_MIPS_PB1500 is not set
@@ -7834,7 +7911,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -198,9 +198,7 @@
+@@ -198,9 +198,7 @@ CONFIG_MTD_PB1100=y
   # CONFIG_MTD_MTX1 is not set
   CONFIG_MTD_PB1500_BOOT=y
   CONFIG_MTD_PB1500_USER=y
@@ -7844,7 +7921,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -219,7 +217,6 @@
+@@ -219,7 +217,6 @@ CONFIG_MTD_PB1500_USER=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -7852,7 +7929,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -324,11 +321,6 @@
+@@ -324,11 +321,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -7864,7 +7941,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -613,7 +605,6 @@
+@@ -613,7 +605,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -7872,7 +7949,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1100 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-@@ -859,6 +850,7 @@
+@@ -859,6 +850,7 @@ CONFIG_DUMMY_CONSOLE=y
   # CONFIG_FB_PM2 is not set
   # CONFIG_FB_PM3 is not set
   # CONFIG_FB_CYBER2000 is not set
@@ -7880,7 +7957,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_FB_MATROX is not set
   # CONFIG_FB_ATY is not set
   # CONFIG_FB_RADEON is not set
-@@ -870,7 +862,6 @@
+@@ -870,7 +862,6 @@ CONFIG_DUMMY_CONSOLE=y
   # CONFIG_FB_VOODOO1 is not set
   # CONFIG_FB_TRIDENT is not set
   # CONFIG_FB_E1356 is not set
@@ -7888,9 +7965,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1100 linux-2.4.32-rc1.mips/arch
   # CONFIG_FB_IT8181 is not set
   # CONFIG_FB_VIRTUAL is not set
   CONFIG_FBCON_ADVANCED=y
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1200 linux-2.4.32-rc1.mips/arch/mips/defconfig-pb1200
---- linux-2.4.32-rc1/arch/mips/defconfig-pb1200        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-pb1200   2005-03-18 13:13:21.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/defconfig-pb1200
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/arch/mips/defconfig-pb1200
  @@ -0,0 +1,1060 @@
  +#
  +# Automatically generated make config: don't edit
@@ -8952,10 +9030,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1200 linux-2.4.32-rc1.mips/arch
  +CONFIG_ZLIB_INFLATE=m
  +CONFIG_ZLIB_DEFLATE=m
  +# CONFIG_FW_LOADER is not set
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1500 linux-2.4.32-rc1.mips/arch/mips/defconfig-pb1500
---- linux-2.4.32-rc1/arch/mips/defconfig-pb1500        2005-01-19 15:09:28.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-pb1500   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-pb1500
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1500
++++ linux-2.4.35.4/arch/mips/defconfig-pb1500
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   CONFIG_MIPS_PB1500=y
@@ -8965,7 +9044,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1500 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -215,9 +215,7 @@
+@@ -215,9 +215,7 @@ CONFIG_MTD_PB1500=y
   # CONFIG_MTD_MTX1 is not set
   CONFIG_MTD_PB1500_BOOT=y
   # CONFIG_MTD_PB1500_USER is not set
@@ -8975,7 +9054,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1500 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -236,7 +234,6 @@
+@@ -236,7 +234,6 @@ CONFIG_MTD_PB1500_BOOT=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -8983,7 +9062,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1500 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -341,11 +338,6 @@
+@@ -341,11 +338,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -8995,7 +9074,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1500 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -675,7 +667,6 @@
+@@ -675,7 +667,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -9003,10 +9082,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1500 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1550 linux-2.4.32-rc1.mips/arch/mips/defconfig-pb1550
---- linux-2.4.32-rc1/arch/mips/defconfig-pb1550        2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-pb1550   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-pb1550
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1550
++++ linux-2.4.35.4/arch/mips/defconfig-pb1550
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9016,7 +9096,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1550 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -213,11 +213,9 @@
+@@ -213,11 +213,9 @@ CONFIG_MTD_CFI_AMDSTD=y
   # CONFIG_MTD_BOSPORUS is not set
   # CONFIG_MTD_XXS1500 is not set
   # CONFIG_MTD_MTX1 is not set
@@ -9028,7 +9108,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1550 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -236,7 +234,6 @@
+@@ -236,7 +234,6 @@ CONFIG_MTD_PB1550_USER=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -9036,7 +9116,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1550 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -343,11 +340,6 @@
+@@ -343,11 +340,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9048,7 +9128,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1550 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -633,7 +625,6 @@
+@@ -633,7 +625,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -9056,10 +9136,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-pb1550 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-rbtx4927 linux-2.4.32-rc1.mips/arch/mips/defconfig-rbtx4927
---- linux-2.4.32-rc1/arch/mips/defconfig-rbtx4927      2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-rbtx4927 2005-03-18 13:13:21.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-rbtx4927
++++ linux-2.4.35.4/arch/mips/defconfig-rbtx4927
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9069,7 +9150,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-rbtx4927 linux-2.4.32-rc1.mips/ar
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -223,11 +223,6 @@
+@@ -223,11 +223,6 @@ CONFIG_IP_PNP_DHCP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9081,7 +9162,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-rbtx4927 linux-2.4.32-rc1.mips/ar
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -466,7 +461,6 @@
+@@ -466,7 +461,6 @@ CONFIG_SERIAL_NONSTANDARD=y
   CONFIG_SERIAL_TXX9=y
   CONFIG_SERIAL_TXX9_CONSOLE=y
   # CONFIG_TXX927_SERIAL is not set
@@ -9089,10 +9170,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-rbtx4927 linux-2.4.32-rc1.mips/ar
   # CONFIG_UNIX98_PTYS is not set
   
   #
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-rm200 linux-2.4.32-rc1.mips/arch/mips/defconfig-rm200
---- linux-2.4.32-rc1/arch/mips/defconfig-rm200 2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-rm200    2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-rm200
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-rm200
++++ linux-2.4.35.4/arch/mips/defconfig-rm200
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9102,7 +9184,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-rm200 linux-2.4.32-rc1.mips/arch/
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -229,11 +229,6 @@
+@@ -229,11 +229,6 @@ CONFIG_INET=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9114,7 +9196,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-rm200 linux-2.4.32-rc1.mips/arch/
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -340,7 +335,6 @@
+@@ -340,7 +335,6 @@ CONFIG_VT_CONSOLE=y
   # CONFIG_SERIAL is not set
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -9122,10 +9204,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-rm200 linux-2.4.32-rc1.mips/arch/
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-sb1250-swarm linux-2.4.32-rc1.mips/arch/mips/defconfig-sb1250-swarm
---- linux-2.4.32-rc1/arch/mips/defconfig-sb1250-swarm  2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-sb1250-swarm     2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-sb1250-swarm
++++ linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9135,7 +9218,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-sb1250-swarm linux-2.4.32-rc1.mip
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -90,6 +90,7 @@
+@@ -90,6 +90,7 @@ CONFIG_SIBYTE_CFE=y
   # CONFIG_SIBYTE_TBPROF is not set
   CONFIG_SIBYTE_GENBUS_IDE=y
   CONFIG_SMP_CAPABLE=y
@@ -9143,7 +9226,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-sb1250-swarm linux-2.4.32-rc1.mip
   # CONFIG_SNI_RM200_PCI is not set
   # CONFIG_TANBAC_TB0226 is not set
   # CONFIG_TANBAC_TB0229 is not set
-@@ -253,11 +254,6 @@
+@@ -253,11 +254,6 @@ CONFIG_INET=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9155,7 +9238,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-sb1250-swarm linux-2.4.32-rc1.mip
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -469,7 +465,6 @@
+@@ -469,7 +465,6 @@ CONFIG_SERIAL_NONSTANDARD=y
   CONFIG_SIBYTE_SB1250_DUART=y
   CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
   CONFIG_SERIAL_CONSOLE=y
@@ -9163,10 +9246,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-sb1250-swarm linux-2.4.32-rc1.mip
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-sead linux-2.4.32-rc1.mips/arch/mips/defconfig-sead
---- linux-2.4.32-rc1/arch/mips/defconfig-sead  2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-sead     2005-03-18 13:13:21.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-sead
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-sead
++++ linux-2.4.35.4/arch/mips/defconfig-sead
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9176,7 +9260,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-sead linux-2.4.32-rc1.mips/arch/m
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -244,7 +244,6 @@
+@@ -244,7 +244,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -9184,10 +9268,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-sead linux-2.4.32-rc1.mips/arch/m
   # CONFIG_UNIX98_PTYS is not set
   
   #
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-stretch linux-2.4.32-rc1.mips/arch/mips/defconfig-stretch
---- linux-2.4.32-rc1/arch/mips/defconfig-stretch       2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-stretch  2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-stretch
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-stretch
++++ linux-2.4.35.4/arch/mips/defconfig-stretch
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9197,7 +9282,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-stretch linux-2.4.32-rc1.mips/arc
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -240,11 +240,6 @@
+@@ -240,11 +240,6 @@ CONFIG_IP_PNP_DHCP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9209,7 +9294,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-stretch linux-2.4.32-rc1.mips/arc
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -324,9 +319,11 @@
+@@ -324,9 +319,11 @@ CONFIG_CHR_DEV_SG=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -9221,7 +9306,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-stretch linux-2.4.32-rc1.mips/arc
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -516,7 +513,6 @@
+@@ -516,7 +513,6 @@ CONFIG_SERIAL_NONSTANDARD=y
   # CONFIG_SERIAL_TXX9 is not set
   # CONFIG_SERIAL_TXX9_CONSOLE is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -9229,10 +9314,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-stretch linux-2.4.32-rc1.mips/arc
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-tb0226 linux-2.4.32-rc1.mips/arch/mips/defconfig-tb0226
---- linux-2.4.32-rc1/arch/mips/defconfig-tb0226        2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-tb0226   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-tb0226
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-tb0226
++++ linux-2.4.35.4/arch/mips/defconfig-tb0226
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9242,7 +9328,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-tb0226 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -228,11 +228,6 @@
+@@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9254,7 +9340,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-tb0226 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -312,9 +307,11 @@
+@@ -312,9 +307,11 @@ CONFIG_SCSI_CONSTANTS=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -9266,7 +9352,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-tb0226 linux-2.4.32-rc1.mips/arch
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -518,7 +515,6 @@
+@@ -518,7 +515,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -9274,10 +9360,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-tb0226 linux-2.4.32-rc1.mips/arch
   # CONFIG_VR41XX_KIU is not set
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-tb0229 linux-2.4.32-rc1.mips/arch/mips/defconfig-tb0229
---- linux-2.4.32-rc1/arch/mips/defconfig-tb0229        2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-tb0229   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-tb0229
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-tb0229
++++ linux-2.4.35.4/arch/mips/defconfig-tb0229
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9287,7 +9374,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-tb0229 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -230,11 +230,6 @@
+@@ -230,11 +230,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9299,7 +9386,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-tb0229 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -445,7 +440,6 @@
+@@ -445,7 +440,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -9307,10 +9394,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-tb0229 linux-2.4.32-rc1.mips/arch
   # CONFIG_VR41XX_KIU is not set
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ti1500 linux-2.4.32-rc1.mips/arch/mips/defconfig-ti1500
---- linux-2.4.32-rc1/arch/mips/defconfig-ti1500        2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-ti1500   2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-ti1500
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ti1500
++++ linux-2.4.35.4/arch/mips/defconfig-ti1500
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9320,7 +9408,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ti1500 linux-2.4.32-rc1.mips/arch
   CONFIG_MIPS_XXS1500=y
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -213,9 +213,7 @@
+@@ -213,9 +213,7 @@ CONFIG_MTD_CFI_AMDSTD=y
   # CONFIG_MTD_BOSPORUS is not set
   CONFIG_MTD_XXS1500=y
   # CONFIG_MTD_MTX1 is not set
@@ -9330,7 +9418,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ti1500 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -234,7 +232,6 @@
+@@ -234,7 +232,6 @@ CONFIG_MTD_XXS1500=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -9338,7 +9426,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ti1500 linux-2.4.32-rc1.mips/arch
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -339,11 +336,6 @@
+@@ -339,11 +336,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9350,7 +9438,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ti1500 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -600,7 +592,6 @@
+@@ -600,7 +592,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -9358,10 +9446,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-ti1500 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-workpad linux-2.4.32-rc1.mips/arch/mips/defconfig-workpad
---- linux-2.4.32-rc1/arch/mips/defconfig-workpad       2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-workpad  2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-workpad
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-workpad
++++ linux-2.4.35.4/arch/mips/defconfig-workpad
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9371,7 +9460,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-workpad linux-2.4.32-rc1.mips/arc
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -222,11 +222,6 @@
+@@ -222,11 +222,6 @@ CONFIG_IP_MULTICAST=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9383,7 +9472,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-workpad linux-2.4.32-rc1.mips/arc
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -426,7 +421,6 @@
+@@ -426,7 +421,6 @@ CONFIG_SERIAL_MANY_PORTS=y
   # CONFIG_SERIAL_MULTIPORT is not set
   # CONFIG_HUB6 is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -9391,10 +9480,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-workpad linux-2.4.32-rc1.mips/arc
   # CONFIG_VR41XX_KIU is not set
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-xxs1500 linux-2.4.32-rc1.mips/arch/mips/defconfig-xxs1500
---- linux-2.4.32-rc1/arch/mips/defconfig-xxs1500       2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-xxs1500  2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-xxs1500
++++ linux-2.4.35.4/arch/mips/defconfig-xxs1500
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9404,7 +9494,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-xxs1500 linux-2.4.32-rc1.mips/arc
   CONFIG_MIPS_XXS1500=y
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -213,9 +213,7 @@
+@@ -213,9 +213,7 @@ CONFIG_MTD_CFI_AMDSTD=y
   # CONFIG_MTD_BOSPORUS is not set
   CONFIG_MTD_XXS1500=y
   # CONFIG_MTD_MTX1 is not set
@@ -9414,7 +9504,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-xxs1500 linux-2.4.32-rc1.mips/arc
   # CONFIG_MTD_MIRAGE is not set
   # CONFIG_MTD_CSTM_MIPS_IXX is not set
   # CONFIG_MTD_OCELOT is not set
-@@ -234,7 +232,6 @@
+@@ -234,7 +232,6 @@ CONFIG_MTD_XXS1500=y
   #
   # Disk-On-Chip Device Drivers
   #
@@ -9422,7 +9512,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-xxs1500 linux-2.4.32-rc1.mips/arc
   # CONFIG_MTD_DOC2000 is not set
   # CONFIG_MTD_DOC2001 is not set
   # CONFIG_MTD_DOCPROBE is not set
-@@ -339,11 +336,6 @@
+@@ -339,11 +336,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9434,7 +9524,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-xxs1500 linux-2.4.32-rc1.mips/arc
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -671,7 +663,6 @@
+@@ -671,7 +663,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y
   # CONFIG_AU1X00_USB_TTY is not set
   # CONFIG_AU1X00_USB_RAW is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -9442,10 +9532,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-xxs1500 linux-2.4.32-rc1.mips/arc
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-yosemite linux-2.4.32-rc1.mips/arch/mips/defconfig-yosemite
---- linux-2.4.32-rc1/arch/mips/defconfig-yosemite      2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/defconfig-yosemite 2005-03-18 13:13:21.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips/defconfig-yosemite
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-yosemite
++++ linux-2.4.35.4/arch/mips/defconfig-yosemite
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -9455,7 +9546,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-yosemite linux-2.4.32-rc1.mips/ar
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -227,11 +227,6 @@
+@@ -227,11 +227,6 @@ CONFIG_IP_PNP_DHCP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -9467,7 +9558,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-yosemite linux-2.4.32-rc1.mips/ar
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -310,9 +305,11 @@
+@@ -310,9 +305,11 @@ CONFIG_CHR_DEV_SG=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -9479,7 +9570,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-yosemite linux-2.4.32-rc1.mips/ar
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -477,7 +474,6 @@
+@@ -477,7 +474,6 @@ CONFIG_SERIAL_NONSTANDARD=y
   # CONFIG_SERIAL_TXX9 is not set
   # CONFIG_SERIAL_TXX9_CONSOLE is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -9487,10 +9578,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/defconfig-yosemite linux-2.4.32-rc1.mips/ar
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips/kernel/cpu-probe.c linux-2.4.32-rc1.mips/arch/mips/kernel/cpu-probe.c
---- linux-2.4.32-rc1/arch/mips/kernel/cpu-probe.c      2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/kernel/cpu-probe.c 2005-05-25 15:33:22.000000000 +0200
-@@ -34,21 +34,16 @@
+Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/cpu-probe.c
++++ linux-2.4.35.4/arch/mips/kernel/cpu-probe.c
+@@ -34,21 +34,16 @@ static void r4k_wait(void)
                 ".set\tmips0");
   }
   
@@ -9520,7 +9612,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/cpu-probe.c linux-2.4.32-rc1.mips/ar
                 "sync\n\t"
                 "nop\n\t"
                 "wait\n\t"
-@@ -57,11 +52,7 @@
+@@ -57,11 +52,7 @@ void au1k_wait(void)
                 "nop\n\t"
                 "nop\n\t"
                 ".set mips0\n\t"
@@ -9533,7 +9625,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/cpu-probe.c linux-2.4.32-rc1.mips/ar
   }
   
   static inline void check_wait(void)
-@@ -100,20 +91,17 @@
+@@ -100,20 +91,17 @@ static inline void check_wait(void)
                 cpu_wait = r4k_wait;
                 printk(" available.\n");
                 break;
@@ -9558,9 +9650,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/cpu-probe.c linux-2.4.32-rc1.mips/ar
         default:
                 printk(" unavailable.\n");
                 break;
-diff -Nur linux-2.4.32-rc1/arch/mips/kernel/head.S linux-2.4.32-rc1.mips/arch/mips/kernel/head.S
---- linux-2.4.32-rc1/arch/mips/kernel/head.S   2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/kernel/head.S      2004-11-22 14:38:23.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/kernel/head.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/head.S
++++ linux-2.4.35.4/arch/mips/kernel/head.S
  @@ -43,9 +43,9 @@
   
                 /* Cache Error */
@@ -9616,7 +9709,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/head.S linux-2.4.32-rc1.mips/arch/mi
                 .set    noat
                 .set    noreorder
                 mtc0    k0, CP0_DESAVE
-@@ -120,7 +126,7 @@
+@@ -120,7 +126,7 @@ ejtag_return:
                 deret
                 .set    mips0
                  nop
@@ -9625,7 +9718,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/head.S linux-2.4.32-rc1.mips/arch/mi
                 END(ejtag_debug_handler)
   
                 __INIT
-@@ -132,13 +138,17 @@
+@@ -132,13 +138,17 @@ ejtag_return:
                 * unconditional jump to this vector.
                 */
                 NESTED(except_vec_nmi, 0, sp)
@@ -9643,7 +9736,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/head.S linux-2.4.32-rc1.mips/arch/mi
                 .set    noat
                 .set    noreorder
                 .set    mips3
-@@ -147,8 +157,7 @@
+@@ -147,8 +157,7 @@ ejtag_return:
                  move   a0, sp
                 RESTORE_ALL
                 eret
@@ -9653,7 +9746,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/head.S linux-2.4.32-rc1.mips/arch/mi
                 END(nmi_handler)
   
                 __INIT
-@@ -157,7 +166,20 @@
+@@ -157,7 +166,20 @@ ejtag_return:
                  * Kernel entry point
                  */
                 NESTED(kernel_entry, 16, sp)
@@ -9674,7 +9767,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/head.S linux-2.4.32-rc1.mips/arch/mi
   
                 /*
                  * The firmware/bootloader passes argc/argp/envp
-@@ -170,8 +192,8 @@
+@@ -170,8 +192,8 @@ ejtag_return:
                 la      t1, (_end - 4)
   1:
                 addiu   t0, 4
@@ -9684,7 +9777,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/head.S linux-2.4.32-rc1.mips/arch/mi
   
                 /*
                  * Stack for kernel and init, current variable
-@@ -182,7 +204,7 @@
+@@ -182,7 +204,7 @@ ejtag_return:
                 sw      t0, kernelsp
   
                 jal     init_arch
@@ -9693,7 +9786,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/head.S linux-2.4.32-rc1.mips/arch/mi
                 END(kernel_entry)
   
   
-@@ -193,17 +215,26 @@
+@@ -193,17 +215,26 @@ ejtag_return:
    * function after setting up the stack and gp registers.
    */
                 LEAF(smp_bootstrap)
@@ -9729,10 +9822,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/head.S linux-2.4.32-rc1.mips/arch/mi
                 END(smp_bootstrap)
   #endif
   
-diff -Nur linux-2.4.32-rc1/arch/mips/kernel/process.c linux-2.4.32-rc1.mips/arch/mips/kernel/process.c
---- linux-2.4.32-rc1/arch/mips/kernel/process.c        2003-08-25 13:44:40.000000000 +0200
-+++ linux-2.4.32-rc1.mips/arch/mips/kernel/process.c   2005-04-14 12:41:44.000000000 +0200
-@@ -128,6 +128,26 @@
+Index: linux-2.4.35.4/arch/mips/kernel/process.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/process.c
++++ linux-2.4.35.4/arch/mips/kernel/process.c
+@@ -128,6 +128,26 @@ int dump_fpu(struct pt_regs *regs, elf_f
         return 1;
   }
   
@@ -9759,10 +9853,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/process.c linux-2.4.32-rc1.mips/arch
   /*
    * Create a kernel thread
    */
-diff -Nur linux-2.4.32-rc1/arch/mips/kernel/scall_o32.S linux-2.4.32-rc1.mips/arch/mips/kernel/scall_o32.S
---- linux-2.4.32-rc1/arch/mips/kernel/scall_o32.S      2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/kernel/scall_o32.S 2005-02-07 22:21:53.000000000 +0100
-@@ -121,15 +121,14 @@
+Index: linux-2.4.35.4/arch/mips/kernel/scall_o32.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/scall_o32.S
++++ linux-2.4.35.4/arch/mips/kernel/scall_o32.S
+@@ -121,15 +121,14 @@ reschedule:
   
   trace_a_syscall:
         SAVE_STATIC
@@ -9780,9 +9875,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/scall_o32.S linux-2.4.32-rc1.mips/ar
   
         li      t0, -EMAXERRNO - 1      # error?
         sltu    t0, t0, v0
-diff -Nur linux-2.4.32-rc1/arch/mips/kernel/setup.c linux-2.4.32-rc1.mips/arch/mips/kernel/setup.c
---- linux-2.4.32-rc1/arch/mips/kernel/setup.c  2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/kernel/setup.c     2005-01-13 22:15:57.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/kernel/setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/setup.c
++++ linux-2.4.35.4/arch/mips/kernel/setup.c
  @@ -5,7 +5,7 @@
    *
    * Copyright (C) 1995  Linus Torvalds
@@ -9792,7 +9888,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/setup.c linux-2.4.32-rc1.mips/arch/m
    * Copyright (C) 1996  Stoned Elipot
    * Copyright (C) 2000, 2001, 2002  Maciej W. Rozycki
    */
-@@ -71,6 +71,8 @@
+@@ -71,6 +71,8 @@ extern void * __rd_start, * __rd_end;
   extern struct rtc_ops no_rtc_ops;
   struct rtc_ops *rtc_ops;
   
@@ -9801,7 +9897,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/setup.c linux-2.4.32-rc1.mips/arch/m
   #ifdef CONFIG_PC_KEYB
   struct kbd_ops *kbd_ops;
   #endif
-@@ -132,10 +134,6 @@
+@@ -132,10 +134,6 @@ init_arch(int argc, char **argv, char **
          */
         load_mmu();
   
@@ -9812,10 +9908,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/setup.c linux-2.4.32-rc1.mips/arch/m
         start_kernel();
   }
   
-diff -Nur linux-2.4.32-rc1/arch/mips/kernel/traps.c linux-2.4.32-rc1.mips/arch/mips/kernel/traps.c
---- linux-2.4.32-rc1/arch/mips/kernel/traps.c  2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/kernel/traps.c     2005-04-12 22:25:34.000000000 +0200
-@@ -452,9 +452,10 @@
+Index: linux-2.4.35.4/arch/mips/kernel/traps.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/traps.c
++++ linux-2.4.35.4/arch/mips/kernel/traps.c
+@@ -452,9 +452,10 @@ static inline void simulate_ll(struct pt
         }
         ll_task = current;
   
@@ -9827,7 +9924,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/traps.c linux-2.4.32-rc1.mips/arch/m
         return;
   
   sig:
-@@ -485,8 +486,8 @@
+@@ -485,8 +486,8 @@ static inline void simulate_sc(struct pt
                 goto sig;
         }
         if (ll_bit == 0 || ll_task != current) {
@@ -9837,7 +9934,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/traps.c linux-2.4.32-rc1.mips/arch/m
                 return;
         }
   
-@@ -495,9 +496,9 @@
+@@ -495,9 +496,9 @@ static inline void simulate_sc(struct pt
                 goto sig;
         }
   
@@ -9848,7 +9945,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/traps.c linux-2.4.32-rc1.mips/arch/m
         return;
   
   sig:
-@@ -887,12 +888,18 @@
+@@ -887,12 +888,18 @@ extern asmlinkage int fpu_emulator_resto
   void __init per_cpu_trap_init(void)
   {
         unsigned int cpu = smp_processor_id();
@@ -9871,7 +9968,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/traps.c linux-2.4.32-rc1.mips/arch/m
   
         /*
          * Some MIPS CPUs have a dedicated interrupt vector which reduces the
-@@ -902,7 +909,7 @@
+@@ -902,7 +909,7 @@ void __init per_cpu_trap_init(void)
                 set_c0_cause(CAUSEF_IV);
   
         cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
@@ -9880,7 +9977,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/traps.c linux-2.4.32-rc1.mips/arch/m
   
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
-@@ -918,8 +925,6 @@
+@@ -918,8 +925,6 @@ void __init trap_init(void)
         extern char except_vec4;
         unsigned long i;
   
@@ -9889,7 +9986,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/traps.c linux-2.4.32-rc1.mips/arch/m
         /* Copy the generic exception handler code to it's final destination. */
         memcpy((void *)(KSEG0 + 0x80), &except_vec1_generic, 0x80);
   
-@@ -1020,10 +1025,5 @@
+@@ -1020,10 +1025,5 @@ void __init trap_init(void)
   
         flush_icache_range(KSEG0, KSEG0 + 0x400);
   
@@ -9901,9 +9998,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/kernel/traps.c linux-2.4.32-rc1.mips/arch/m
  -      TLBMISS_HANDLER_SETUP();
  +      per_cpu_trap_init();
   }
-diff -Nur linux-2.4.32-rc1/arch/mips/lib/rtc-no.c linux-2.4.32-rc1.mips/arch/mips/lib/rtc-no.c
---- linux-2.4.32-rc1/arch/mips/lib/rtc-no.c    2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/lib/rtc-no.c       2005-01-13 22:15:57.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/lib/rtc-no.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/lib/rtc-no.c
++++ linux-2.4.35.4/arch/mips/lib/rtc-no.c
  @@ -6,10 +6,9 @@
    * Stub RTC routines to keep Linux from crashing on machine which don't
    * have a RTC chip.
@@ -9916,15 +10014,16 @@ diff -Nur linux-2.4.32-rc1/arch/mips/lib/rtc-no.c linux-2.4.32-rc1.mips/arch/mip
   #include <linux/mc146818rtc.h>
   
   static unsigned int shouldnt_happen(void)
-@@ -29,5 +28,3 @@
+@@ -29,5 +28,3 @@ struct rtc_ops no_rtc_ops = {
       .rtc_write_data = (void *) &shouldnt_happen,
       .rtc_bcd_mode   = (void *) &shouldnt_happen
   };
  -
  -EXPORT_SYMBOL(rtc_ops);
-diff -Nur linux-2.4.32-rc1/arch/mips/lib/rtc-std.c linux-2.4.32-rc1.mips/arch/mips/lib/rtc-std.c
---- linux-2.4.32-rc1/arch/mips/lib/rtc-std.c   2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/lib/rtc-std.c      2005-01-13 22:15:57.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/lib/rtc-std.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/lib/rtc-std.c
++++ linux-2.4.35.4/arch/mips/lib/rtc-std.c
  @@ -5,9 +5,8 @@
    *
    * RTC routines for PC style attached Dallas chip.
@@ -9936,16 +10035,17 @@ diff -Nur linux-2.4.32-rc1/arch/mips/lib/rtc-std.c linux-2.4.32-rc1.mips/arch/mi
   #include <linux/mc146818rtc.h>
   #include <asm/io.h>
   
-@@ -33,5 +32,3 @@
+@@ -33,5 +32,3 @@ struct rtc_ops std_rtc_ops = {
         &std_rtc_write_data,
         &std_rtc_bcd_mode
   };
  -
  -EXPORT_SYMBOL(rtc_ops);
-diff -Nur linux-2.4.32-rc1/arch/mips/Makefile linux-2.4.32-rc1.mips/arch/mips/Makefile
---- linux-2.4.32-rc1/arch/mips/Makefile        2005-01-19 15:09:26.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/Makefile   2005-01-30 09:01:26.000000000 +0100
-@@ -211,7 +211,7 @@
+Index: linux-2.4.35.4/arch/mips/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/Makefile
++++ linux-2.4.35.4/arch/mips/Makefile
+@@ -209,7 +209,7 @@ LOADADDR   := 0x80080000
   endif
   
   #
@@ -9954,7 +10054,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/Makefile linux-2.4.32-rc1.mips/arch/mips/Ma
   #
   ifdef CONFIG_MIPS_PB1000
   LIBS          += arch/mips/au1000/pb1000/pb1000.o \
-@@ -220,9 +220,6 @@
+@@ -218,9 +218,6 @@ SUBDIRS            += arch/mips/au1000/pb1000 arch
   LOADADDR      := 0x80100000
   endif
   
@@ -9964,7 +10064,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/Makefile linux-2.4.32-rc1.mips/arch/mips/Ma
   ifdef CONFIG_MIPS_PB1100
   LIBS          += arch/mips/au1000/pb1100/pb1100.o \
                    arch/mips/au1000/common/au1000.o
-@@ -230,9 +227,6 @@
+@@ -228,9 +225,6 @@ SUBDIRS       += arch/mips/au1000/pb1100
   LOADADDR      += 0x80100000
   endif
   
@@ -9974,7 +10074,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/Makefile linux-2.4.32-rc1.mips/arch/mips/Ma
   ifdef CONFIG_MIPS_PB1500
   LIBS          += arch/mips/au1000/pb1500/pb1500.o \
                    arch/mips/au1000/common/au1000.o
-@@ -240,9 +234,6 @@
+@@ -238,9 +232,6 @@ SUBDIRS            += arch/mips/au1000/pb1500 arch
   LOADADDR      := 0x80100000
   endif
   
@@ -9984,7 +10084,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/Makefile linux-2.4.32-rc1.mips/arch/mips/Ma
   ifdef CONFIG_MIPS_DB1000
   LIBS          += arch/mips/au1000/db1x00/db1x00.o \
                    arch/mips/au1000/common/au1000.o
-@@ -313,6 +304,27 @@
+@@ -311,6 +302,27 @@ SUBDIRS       += arch/mips/au1000/pb1550
   LOADADDR      += 0x80100000
   endif
   
@@ -10012,10 +10112,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/Makefile linux-2.4.32-rc1.mips/arch/mips/Ma
   
   #
   # Cogent CSB250
-diff -Nur linux-2.4.32-rc1/arch/mips/mm/cerr-sb1.c linux-2.4.32-rc1.mips/arch/mips/mm/cerr-sb1.c
---- linux-2.4.32-rc1/arch/mips/mm/cerr-sb1.c   2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/mm/cerr-sb1.c      2004-12-13 18:37:23.000000000 +0100
-@@ -252,14 +252,14 @@
+Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/mm/cerr-sb1.c
++++ linux-2.4.35.4/arch/mips/mm/cerr-sb1.c
+@@ -252,14 +252,14 @@ static const uint8_t parity[256] = {
   
   /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
   static const uint64_t mask_72_64[8] = {
@@ -10038,7 +10139,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/cerr-sb1.c linux-2.4.32-rc1.mips/arch/mi
   };
   
   /* Calculate the parity on a range of bits */
-@@ -331,9 +331,9 @@
+@@ -331,9 +331,9 @@ static uint32_t extract_ic(unsigned shor
                                     ((lru >> 4) & 0x3),
                                     ((lru >> 6) & 0x3));
                 }
@@ -10050,7 +10151,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/cerr-sb1.c linux-2.4.32-rc1.mips/arch/mi
                 valid = ((taghi >> 29) & 1);
                 if (valid) {
                         tlo_tmp = taglo & 0xfff3ff;
-@@ -474,7 +474,7 @@
+@@ -474,7 +474,7 @@ static uint32_t extract_dc(unsigned shor
                 : "r" ((way << 13) | addr));
   
                 taglo = ((unsigned long long)taglohi << 32) | taglolo;
@@ -10059,10 +10160,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/cerr-sb1.c linux-2.4.32-rc1.mips/arch/mi
                 if (way == 0) {
                         lru = (taghi >> 14) & 0xff;
                         prom_printf("[Bank %d Set 0x%02x]  LRU > %d %d %d %d > MRU\n",
-diff -Nur linux-2.4.32-rc1/arch/mips/mm/c-r4k.c linux-2.4.32-rc1.mips/arch/mips/mm/c-r4k.c
---- linux-2.4.32-rc1/arch/mips/mm/c-r4k.c      2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/mm/c-r4k.c 2005-02-06 22:55:42.000000000 +0100
-@@ -867,9 +867,16 @@
+Index: linux-2.4.35.4/arch/mips/mm/c-r4k.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/mm/c-r4k.c
++++ linux-2.4.35.4/arch/mips/mm/c-r4k.c
+@@ -867,9 +867,16 @@ static void __init probe_pcache(void)
          * normally they'd suffer from aliases but magic in the hardware deals
          * with that for us so we don't need to take care ourselves.
          */
@@ -10082,7 +10184,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/c-r4k.c linux-2.4.32-rc1.mips/arch/mips/
   
         switch (c->cputype) {
         case CPU_20KC:
-@@ -1069,9 +1076,6 @@
+@@ -1069,9 +1076,6 @@ void __init ld_mmu_r4xx0(void)
         probe_pcache();
         setup_scache();
   
@@ -10092,9 +10194,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/c-r4k.c linux-2.4.32-rc1.mips/arch/mips/
         r4k_blast_dcache_page_setup();
         r4k_blast_dcache_page_indexed_setup();
         r4k_blast_dcache_setup();
-diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlbex-mips32.S linux-2.4.32-rc1.mips/arch/mips/mm/tlbex-mips32.S
---- linux-2.4.32-rc1/arch/mips/mm/tlbex-mips32.S       2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/mm/tlbex-mips32.S  2004-11-29 00:33:15.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/mm/tlbex-mips32.S
++++ linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S
  @@ -196,7 +196,7 @@
         .set    noat; \
         SAVE_ALL; \
@@ -10104,9 +10207,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlbex-mips32.S linux-2.4.32-rc1.mips/arc
         .set    at; \
         move    a0, sp; \
         jal     do_page_fault; \
-diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch/mips/mm/tlbex-r4k.S
---- linux-2.4.32-rc1/arch/mips/mm/tlbex-r4k.S  2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/mm/tlbex-r4k.S     2005-06-06 16:46:22.000000000 +0200
+Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/mm/tlbex-r4k.S
++++ linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S
  @@ -184,13 +184,10 @@
         P_MTC0  k0, CP0_ENTRYLO0                # load it
         PTE_SRL k1, k1, 6                       # convert to entrylo1
@@ -10124,7 +10228,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch/m
         END(except_vec0_r4000)
   
         /* TLB refill, EXL == 0, R4600 version */
-@@ -468,13 +465,9 @@
+@@ -468,13 +465,9 @@ invalid_tlbl:
         PTE_PRESENT(k0, k1, nopage_tlbl)
         PTE_MAKEVALID(k0, k1)
         PTE_RELOAD(k1, k0)
@@ -10141,7 +10245,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch/m
         .set    mips3
         eret
         .set    mips0
-@@ -496,13 +489,9 @@
+@@ -496,13 +489,9 @@ nopage_tlbl:
         PTE_WRITABLE(k0, k1, nopage_tlbs)
         PTE_MAKEWRITE(k0, k1)
         PTE_RELOAD(k1, k0)
@@ -10158,7 +10262,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch/m
         .set    mips3
         eret
         .set    mips0
-@@ -529,13 +518,9 @@
+@@ -529,13 +518,9 @@ nopage_tlbs:
   
         /* Now reload the entry into the tlb. */
         PTE_RELOAD(k1, k0)
@@ -10175,9 +10279,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch/m
         .set    mips3
         eret
         .set    mips0
-diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mips/mm/tlb-r4k.c
---- linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c    2005-01-19 15:09:29.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips/mm/tlb-r4k.c       2004-11-25 23:18:38.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/mm/tlb-r4k.c
++++ linux-2.4.35.4/arch/mips/mm/tlb-r4k.c
  @@ -3,17 +3,12 @@
    * License.  See the file "COPYING" in the main directory of this archive
    * for more details.
@@ -10209,7 +10314,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
   extern char except_vec0_nevada, except_vec0_r4000, except_vec0_r4600;
   
   /* CP0 hazard avoidance. */
-@@ -41,33 +33,23 @@
+@@ -41,33 +33,23 @@ void local_flush_tlb_all(void)
         unsigned long old_ctx;
         int entry;
   
@@ -10245,7 +10350,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
         write_c0_entryhi(old_ctx);
         local_irq_restore(flags);
   }
-@@ -76,12 +58,8 @@
+@@ -76,12 +58,8 @@ void local_flush_tlb_mm(struct mm_struct
   {
         int cpu = smp_processor_id();
   
@@ -10259,7 +10364,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
   }
   
   void local_flush_tlb_range(struct mm_struct *mm, unsigned long start,
-@@ -93,10 +71,6 @@
+@@ -93,10 +71,6 @@ void local_flush_tlb_range(struct mm_str
                 unsigned long flags;
                 int size;
   
@@ -10270,7 +10375,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
                 local_irq_save(flags);
                 size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
                 size = (size + 1) >> 1;
-@@ -112,7 +86,7 @@
+@@ -112,7 +86,7 @@ void local_flush_tlb_range(struct mm_str
   
                                 write_c0_entryhi(start | newpid);
                                 start += (PAGE_SIZE << 1);
@@ -10279,7 +10384,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
                                 tlb_probe();
                                 BARRIER;
                                 idx = read_c0_index();
-@@ -122,10 +96,10 @@
+@@ -122,10 +96,10 @@ void local_flush_tlb_range(struct mm_str
                                         continue;
                                 /* Make sure all entries differ. */
                                 write_c0_entryhi(KSEG0 + idx*0x2000);
@@ -10292,7 +10397,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
                         write_c0_entryhi(oldpid);
                 } else {
                         drop_mmu_context(mm, cpu);
-@@ -138,34 +112,30 @@
+@@ -138,34 +112,30 @@ void local_flush_tlb_page(struct vm_area
   {
         int cpu = smp_processor_id();
   
@@ -10333,7 +10438,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
                 write_c0_entryhi(oldpid);
                 local_irq_restore(flags);
         }
-@@ -185,7 +155,7 @@
+@@ -185,7 +155,7 @@ void local_flush_tlb_one(unsigned long p
   
         local_irq_save(flags);
         write_c0_entryhi(page);
@@ -10342,7 +10447,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
         tlb_probe();
         BARRIER;
         idx = read_c0_index();
-@@ -194,18 +164,19 @@
+@@ -194,18 +164,19 @@ void local_flush_tlb_one(unsigned long p
         if (idx >= 0) {
                 /* Make sure all entries differ. */
                 write_c0_entryhi(KSEG0+idx*0x2000);
@@ -10366,7 +10471,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
    */
   void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
   {
-@@ -223,25 +194,16 @@
+@@ -223,25 +194,16 @@ void __update_tlb(struct vm_area_struct 
   
         pid = read_c0_entryhi() & ASID_MASK;
   
@@ -10393,7 +10498,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
   #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32)
         write_c0_entrylo0(ptep->pte_high);
         ptep++;
-@@ -251,15 +213,13 @@
+@@ -251,15 +213,13 @@ void __update_tlb(struct vm_area_struct 
         write_c0_entrylo1(pte_val(*ptep) >> 6);
   #endif
         write_c0_entryhi(address | pid);
@@ -10413,7 +10518,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
         local_irq_restore(flags);
   }
   
-@@ -279,24 +239,26 @@
+@@ -279,24 +239,26 @@ static void r4k_update_mmu_cache_hwbug(s
         asid = read_c0_entryhi() & ASID_MASK;
         write_c0_entryhi(address | asid);
         pgdp = pgd_offset(vma->vm_mm, address);
@@ -10443,7 +10548,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
   {
         unsigned long flags;
         unsigned long wired;
-@@ -315,9 +277,9 @@
+@@ -315,9 +277,9 @@ void __init add_wired_entry(unsigned lon
         write_c0_entryhi(entryhi);
         write_c0_entrylo0(entrylo0);
         write_c0_entrylo1(entrylo1);
@@ -10455,7 +10560,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
   
         write_c0_entryhi(old_ctx);
         BARRIER;
-@@ -355,17 +317,15 @@
+@@ -355,17 +317,15 @@ __init int add_temporary_entry(unsigned 
         }
   
         write_c0_index(temp_tlb_entry);
@@ -10475,7 +10580,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
         write_c0_pagemask(old_pagemask);
   out:
         local_irq_restore(flags);
-@@ -375,7 +335,7 @@
+@@ -375,7 +335,7 @@ out:
   static void __init probe_tlb(unsigned long config)
   {
         struct cpuinfo_mips *c = &current_cpu_data;
@@ -10484,7 +10589,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
   
         /*
          * If this isn't a MIPS32 / MIPS64 compliant CPU.  Config 1 register
-@@ -385,16 +345,16 @@
+@@ -385,16 +345,16 @@ static void __init probe_tlb(unsigned lo
         if ((c->processor_id  & 0xff0000) == PRID_COMP_LEGACY)
                 return;
   
@@ -10504,10 +10609,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mip
   
         /*
          * You should never change this register:
-diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig linux-2.4.32-rc1.mips/arch/mips64/defconfig
---- linux-2.4.32-rc1/arch/mips64/defconfig     2005-01-19 15:09:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/defconfig        2005-03-18 13:13:23.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig
++++ linux-2.4.35.4/arch/mips64/defconfig
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -10517,7 +10623,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig linux-2.4.32-rc1.mips/arch/mips
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -470,9 +470,11 @@
+@@ -470,9 +470,11 @@ CONFIG_SCSI_LOGGING=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -10529,7 +10635,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig linux-2.4.32-rc1.mips/arch/mips
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -658,7 +660,6 @@
+@@ -658,7 +660,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -10537,10 +10643,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig linux-2.4.32-rc1.mips/arch/mips
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-atlas linux-2.4.32-rc1.mips/arch/mips64/defconfig-atlas
---- linux-2.4.32-rc1/arch/mips64/defconfig-atlas       2005-01-19 15:09:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/defconfig-atlas  2005-03-18 13:13:23.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig-atlas
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-atlas
++++ linux-2.4.35.4/arch/mips64/defconfig-atlas
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -10550,7 +10657,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-atlas linux-2.4.32-rc1.mips/arc
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -232,11 +232,6 @@
+@@ -232,11 +232,6 @@ CONFIG_IP_PNP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -10562,7 +10669,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-atlas linux-2.4.32-rc1.mips/arc
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -314,9 +309,11 @@
+@@ -314,9 +309,11 @@ CONFIG_SD_EXTRA_DEVS=40
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -10574,7 +10681,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-atlas linux-2.4.32-rc1.mips/arc
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -474,7 +471,6 @@
+@@ -474,7 +471,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -10582,10 +10689,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-atlas linux-2.4.32-rc1.mips/arc
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-decstation linux-2.4.32-rc1.mips/arch/mips64/defconfig-decstation
---- linux-2.4.32-rc1/arch/mips64/defconfig-decstation  2005-01-19 15:09:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/defconfig-decstation     2005-03-18 13:13:23.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig-decstation
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-decstation
++++ linux-2.4.35.4/arch/mips64/defconfig-decstation
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -10595,7 +10703,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-decstation linux-2.4.32-rc1.mip
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -224,11 +224,6 @@
+@@ -224,11 +224,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -10607,7 +10715,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-decstation linux-2.4.32-rc1.mip
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -307,9 +302,11 @@
+@@ -307,9 +302,11 @@ CONFIG_SCSI_DECNCR=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -10619,7 +10727,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-decstation linux-2.4.32-rc1.mip
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -477,7 +474,6 @@
+@@ -477,7 +474,6 @@ CONFIG_SERIAL_DEC=y
   CONFIG_SERIAL_DEC_CONSOLE=y
   # CONFIG_DZ is not set
   CONFIG_ZS=y
@@ -10627,10 +10735,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-decstation linux-2.4.32-rc1.mip
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ip22 linux-2.4.32-rc1.mips/arch/mips64/defconfig-ip22
---- linux-2.4.32-rc1/arch/mips64/defconfig-ip22        2005-01-19 15:09:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/defconfig-ip22   2005-03-18 13:13:23.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig-ip22
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-ip22
++++ linux-2.4.35.4/arch/mips64/defconfig-ip22
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -10640,7 +10749,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ip22 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -235,11 +235,6 @@
+@@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -10652,7 +10761,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ip22 linux-2.4.32-rc1.mips/arch
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -319,9 +314,11 @@
+@@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -10664,7 +10773,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ip22 linux-2.4.32-rc1.mips/arch
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -488,7 +485,6 @@
+@@ -488,7 +485,6 @@ CONFIG_SERIAL_NONSTANDARD=y
   # CONFIG_SERIAL_TXX9_CONSOLE is not set
   # CONFIG_TXX927_SERIAL is not set
   CONFIG_IP22_SERIAL=y
@@ -10672,10 +10781,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ip22 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ip27 linux-2.4.32-rc1.mips/arch/mips64/defconfig-ip27
---- linux-2.4.32-rc1/arch/mips64/defconfig-ip27        2005-01-19 15:09:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/defconfig-ip27   2005-03-18 13:13:23.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig-ip27
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-ip27
++++ linux-2.4.35.4/arch/mips64/defconfig-ip27
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -10685,7 +10795,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ip27 linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -470,9 +470,11 @@
+@@ -470,9 +470,11 @@ CONFIG_SCSI_LOGGING=y
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -10697,7 +10807,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ip27 linux-2.4.32-rc1.mips/arch
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -658,7 +660,6 @@
+@@ -658,7 +660,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -10705,10 +10815,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ip27 linux-2.4.32-rc1.mips/arch
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-jaguar linux-2.4.32-rc1.mips/arch/mips64/defconfig-jaguar
---- linux-2.4.32-rc1/arch/mips64/defconfig-jaguar      2005-01-19 15:09:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/defconfig-jaguar 2005-03-18 13:13:23.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-jaguar
++++ linux-2.4.35.4/arch/mips64/defconfig-jaguar
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -10718,7 +10829,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-jaguar linux-2.4.32-rc1.mips/ar
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -227,11 +227,6 @@
+@@ -227,11 +227,6 @@ CONFIG_IP_PNP_DHCP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -10730,7 +10841,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-jaguar linux-2.4.32-rc1.mips/ar
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -403,7 +398,6 @@
+@@ -403,7 +398,6 @@ CONFIG_SERIAL_NONSTANDARD=y
   # CONFIG_SERIAL_TXX9 is not set
   # CONFIG_SERIAL_TXX9_CONSOLE is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -10738,10 +10849,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-jaguar linux-2.4.32-rc1.mips/ar
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-malta linux-2.4.32-rc1.mips/arch/mips64/defconfig-malta
---- linux-2.4.32-rc1/arch/mips64/defconfig-malta       2005-01-19 15:09:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/defconfig-malta  2005-04-19 14:19:34.000000000 +0200
-@@ -22,16 +22,19 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig-malta
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-malta
++++ linux-2.4.35.4/arch/mips64/defconfig-malta
+@@ -22,16 +22,19 @@ CONFIG_KMOD=y
   #
   # CONFIG_ACER_PICA_61 is not set
   # CONFIG_MIPS_BOSPORUS is not set
@@ -10762,7 +10874,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-malta linux-2.4.32-rc1.mips/arc
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -146,9 +149,9 @@
+@@ -146,9 +149,9 @@ CONFIG_KCORE_ELF=y
   CONFIG_BINFMT_ELF=y
   CONFIG_MIPS32_COMPAT=y
   CONFIG_MIPS32_O32=y
@@ -10774,7 +10886,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-malta linux-2.4.32-rc1.mips/arc
   # CONFIG_OOM_KILLER is not set
   # CONFIG_CMDLINE_BOOL is not set
   
-@@ -235,11 +238,6 @@
+@@ -235,11 +238,6 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -10786,7 +10898,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-malta linux-2.4.32-rc1.mips/arc
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -271,8 +269,83 @@
+@@ -271,8 +269,83 @@ CONFIG_IP_PNP_BOOTP=y
   #
   # ATA/IDE/MFM/RLL support
   #
@@ -10871,7 +10983,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-malta linux-2.4.32-rc1.mips/arc
   
   #
   # SCSI support
-@@ -317,9 +390,11 @@
+@@ -317,9 +390,11 @@ CONFIG_SD_EXTRA_DEVS=40
   # CONFIG_SCSI_MEGARAID is not set
   # CONFIG_SCSI_MEGARAID2 is not set
   # CONFIG_SCSI_SATA is not set
@@ -10883,7 +10995,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-malta linux-2.4.32-rc1.mips/arc
   # CONFIG_SCSI_SATA_PROMISE is not set
   # CONFIG_SCSI_SATA_SX4 is not set
   # CONFIG_SCSI_SATA_SIL is not set
-@@ -477,7 +552,6 @@
+@@ -477,7 +552,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -10891,10 +11003,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-malta linux-2.4.32-rc1.mips/arc
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ocelotc linux-2.4.32-rc1.mips/arch/mips64/defconfig-ocelotc
---- linux-2.4.32-rc1/arch/mips64/defconfig-ocelotc     2005-01-19 15:09:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/defconfig-ocelotc        2005-03-18 13:13:23.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-ocelotc
++++ linux-2.4.35.4/arch/mips64/defconfig-ocelotc
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -10904,7 +11017,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ocelotc linux-2.4.32-rc1.mips/a
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -231,11 +231,6 @@
+@@ -231,11 +231,6 @@ CONFIG_IP_PNP_DHCP=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -10916,7 +11029,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ocelotc linux-2.4.32-rc1.mips/a
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -453,7 +448,6 @@
+@@ -453,7 +448,6 @@ CONFIG_SERIAL_NONSTANDARD=y
   # CONFIG_SERIAL_TXX9 is not set
   # CONFIG_SERIAL_TXX9_CONSOLE is not set
   # CONFIG_TXX927_SERIAL is not set
@@ -10924,10 +11037,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-ocelotc linux-2.4.32-rc1.mips/a
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-sb1250-swarm linux-2.4.32-rc1.mips/arch/mips64/defconfig-sb1250-swarm
---- linux-2.4.32-rc1/arch/mips64/defconfig-sb1250-swarm        2005-01-19 15:09:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/defconfig-sb1250-swarm   2005-03-18 13:13:23.000000000 +0100
-@@ -30,8 +30,8 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-sb1250-swarm
++++ linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm
+@@ -30,8 +30,8 @@ CONFIG_KMOD=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -10937,7 +11051,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-sb1250-swarm linux-2.4.32-rc1.m
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -90,6 +90,7 @@
+@@ -90,6 +90,7 @@ CONFIG_SIBYTE_CFE=y
   # CONFIG_SIBYTE_TBPROF is not set
   CONFIG_SIBYTE_GENBUS_IDE=y
   CONFIG_SMP_CAPABLE=y
@@ -10945,7 +11059,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-sb1250-swarm linux-2.4.32-rc1.m
   # CONFIG_SNI_RM200_PCI is not set
   # CONFIG_TANBAC_TB0226 is not set
   # CONFIG_TANBAC_TB0229 is not set
-@@ -253,11 +254,6 @@
+@@ -253,11 +254,6 @@ CONFIG_INET=y
   #
   # CONFIG_IPX is not set
   # CONFIG_ATALK is not set
@@ -10957,7 +11071,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-sb1250-swarm linux-2.4.32-rc1.m
   # CONFIG_DECNET is not set
   # CONFIG_BRIDGE is not set
   # CONFIG_X25 is not set
-@@ -432,7 +428,6 @@
+@@ -432,7 +428,6 @@ CONFIG_SERIAL_NONSTANDARD=y
   CONFIG_SIBYTE_SB1250_DUART=y
   CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
   CONFIG_SERIAL_CONSOLE=y
@@ -10965,10 +11079,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-sb1250-swarm linux-2.4.32-rc1.m
   CONFIG_UNIX98_PTYS=y
   CONFIG_UNIX98_PTY_COUNT=256
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-sead linux-2.4.32-rc1.mips/arch/mips64/defconfig-sead
---- linux-2.4.32-rc1/arch/mips64/defconfig-sead        2005-01-19 15:09:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/defconfig-sead   2005-03-18 13:13:23.000000000 +0100
-@@ -28,8 +28,8 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig-sead
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-sead
++++ linux-2.4.35.4/arch/mips64/defconfig-sead
+@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
   # CONFIG_MIPS_PB1000 is not set
   # CONFIG_MIPS_PB1100 is not set
   # CONFIG_MIPS_PB1500 is not set
@@ -10978,7 +11093,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-sead linux-2.4.32-rc1.mips/arch
   # CONFIG_MIPS_XXS1500 is not set
   # CONFIG_MIPS_MTX1 is not set
   # CONFIG_COGENT_CSB250 is not set
-@@ -242,7 +242,6 @@
+@@ -242,7 +242,6 @@ CONFIG_SERIAL=y
   CONFIG_SERIAL_CONSOLE=y
   # CONFIG_SERIAL_EXTENDED is not set
   # CONFIG_SERIAL_NONSTANDARD is not set
@@ -10986,10 +11101,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/defconfig-sead linux-2.4.32-rc1.mips/arch
   # CONFIG_UNIX98_PTYS is not set
   
   #
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/binfmt_elfn32.c linux-2.4.32-rc1.mips/arch/mips64/kernel/binfmt_elfn32.c
---- linux-2.4.32-rc1/arch/mips64/kernel/binfmt_elfn32.c        2003-08-25 13:44:40.000000000 +0200
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/binfmt_elfn32.c   2005-01-26 03:40:47.000000000 +0100
-@@ -116,4 +116,7 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfn32.c
++++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c
+@@ -116,4 +116,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux-
   #undef MODULE_DESCRIPTION
   #undef MODULE_AUTHOR
   
@@ -10997,10 +11113,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/binfmt_elfn32.c linux-2.4.32-rc1.m
  +#define TASK_SIZE TASK_SIZE32
  +
   #include "../../../fs/binfmt_elf.c"
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/binfmt_elfo32.c linux-2.4.32-rc1.mips/arch/mips64/kernel/binfmt_elfo32.c
---- linux-2.4.32-rc1/arch/mips64/kernel/binfmt_elfo32.c        2003-08-25 13:44:40.000000000 +0200
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/binfmt_elfo32.c   2005-01-26 03:40:47.000000000 +0100
-@@ -137,4 +137,7 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfo32.c
++++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c
+@@ -137,4 +137,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux-
   #undef MODULE_DESCRIPTION
   #undef MODULE_AUTHOR
   
@@ -11008,10 +11125,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/binfmt_elfo32.c linux-2.4.32-rc1.m
  +#define TASK_SIZE TASK_SIZE32
  +
   #include "../../../fs/binfmt_elf.c"
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/head.S linux-2.4.32-rc1.mips/arch/mips64/kernel/head.S
---- linux-2.4.32-rc1/arch/mips64/kernel/head.S 2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/head.S    2004-11-22 14:38:26.000000000 +0100
-@@ -91,6 +91,21 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/head.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/head.S
++++ linux-2.4.35.4/arch/mips64/kernel/head.S
+@@ -91,6 +91,21 @@ EXPORT(_stext)
         __INIT
   
   NESTED(kernel_entry, 16, sp)                  # kernel entry point
@@ -11033,7 +11151,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/head.S linux-2.4.32-rc1.mips/arch/
   
         ori     sp, 0xf                         # align stack on 16 byte.
         xori    sp, 0xf
-@@ -103,8 +118,6 @@
+@@ -103,8 +118,6 @@ NESTED(kernel_entry, 16, sp)                       # kernel 
   
         ARC64_TWIDDLE_PC
   
@@ -11042,7 +11160,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/head.S linux-2.4.32-rc1.mips/arch/
         /*
          * The firmware/bootloader passes argc/argp/envp
          * to us as arguments.  But clear bss first because
-@@ -125,6 +138,7 @@
+@@ -125,6 +138,7 @@ NESTED(kernel_entry, 16, sp)                       # kernel 
         dsubu   sp, 4*SZREG                     # init stack pointer
   
         j       init_arch
@@ -11050,7 +11168,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/head.S linux-2.4.32-rc1.mips/arch/
         END(kernel_entry)
   
   #ifdef CONFIG_SMP
-@@ -133,6 +147,23 @@
+@@ -133,6 +147,23 @@ NESTED(kernel_entry, 16, sp)                      # kernel 
    * function after setting up the stack and gp registers.
    */
   NESTED(smp_bootstrap, 16, sp)
@@ -11074,7 +11192,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/head.S linux-2.4.32-rc1.mips/arch/
   #ifdef CONFIG_SGI_IP27
         GET_NASID_ASM   t1
         dli     t0, KLDIR_OFFSET + (KLI_KERN_VARS * KLDIR_ENT_SIZE) + \
-@@ -146,19 +177,8 @@
+@@ -146,19 +177,8 @@ NESTED(smp_bootstrap, 16, sp)
         ARC64_TWIDDLE_PC
   #endif /* CONFIG_SGI_IP27 */
   
@@ -11095,10 +11213,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/head.S linux-2.4.32-rc1.mips/arch/
         END(smp_bootstrap)
   #endif /* CONFIG_SMP */
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/ioctl32.c linux-2.4.32-rc1.mips/arch/mips64/kernel/ioctl32.c
---- linux-2.4.32-rc1/arch/mips64/kernel/ioctl32.c      2005-01-19 15:09:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/ioctl32.c 2005-01-26 03:36:17.000000000 +0100
-@@ -2352,7 +2352,7 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/ioctl32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/ioctl32.c
++++ linux-2.4.35.4/arch/mips64/kernel/ioctl32.c
+@@ -2352,7 +2352,7 @@ static struct ioctl32_list ioctl32_handl
         IOCTL32_HANDLER(AUTOFS_IOC_SETTIMEOUT32, ioc_settimeout),
         IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE),
         IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE_MULTI),
@@ -11107,10 +11226,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/ioctl32.c linux-2.4.32-rc1.mips/ar
         IOCTL32_DEFAULT(AUTOFS_IOC_ASKREGHOST),
         IOCTL32_DEFAULT(AUTOFS_IOC_TOGGLEREGHOST),
         IOCTL32_DEFAULT(AUTOFS_IOC_ASKUMOUNT),
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/linux32.c linux-2.4.32-rc1.mips/arch/mips64/kernel/linux32.c
---- linux-2.4.32-rc1/arch/mips64/kernel/linux32.c      2005-04-04 03:42:19.000000000 +0200
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/linux32.c 2005-04-22 15:01:00.000000000 +0200
-@@ -1101,6 +1101,7 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/linux32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/linux32.c
++++ linux-2.4.35.4/arch/mips64/kernel/linux32.c
+@@ -1101,6 +1101,7 @@ do_readv_writev32(int type, struct file 
          * specially as they have atomicity guarantees and can handle
          * iovec's natively
          */
@@ -11118,7 +11238,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/linux32.c linux-2.4.32-rc1.mips/ar
         if (inode->i_sock) {
                 int err;
                 err = sock_readv_writev(type, inode, file, iov, count, tot_len);
-@@ -1187,72 +1188,19 @@
+@@ -1187,72 +1188,19 @@ bad_file:
      lseek back to original location.  They fail just like lseek does on
      non-seekable files.  */
   
@@ -11196,10 +11316,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/linux32.c linux-2.4.32-rc1.mips/ar
   /*
    * Ooo, nasty.  We need here to frob 32-bit unsigned longs to
    * 64-bit unsigned longs.
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/process.c linux-2.4.32-rc1.mips/arch/mips64/kernel/process.c
---- linux-2.4.32-rc1/arch/mips64/kernel/process.c      2003-08-25 13:44:40.000000000 +0200
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/process.c 2005-04-14 12:41:44.000000000 +0200
-@@ -125,6 +125,25 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/process.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/process.c
++++ linux-2.4.35.4/arch/mips64/kernel/process.c
+@@ -125,6 +125,25 @@ int dump_fpu(struct pt_regs *regs, elf_f
         return 1;
   }
   
@@ -11225,10 +11346,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/process.c linux-2.4.32-rc1.mips/ar
   /*
    * Create a kernel thread
    */
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/scall_64.S linux-2.4.32-rc1.mips/arch/mips64/kernel/scall_64.S
---- linux-2.4.32-rc1/arch/mips64/kernel/scall_64.S     2005-01-19 15:09:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/scall_64.S        2005-02-07 22:21:54.000000000 +0100
-@@ -102,15 +102,14 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/scall_64.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_64.S
++++ linux-2.4.35.4/arch/mips64/kernel/scall_64.S
+@@ -102,15 +102,14 @@ _64_reschedule:
   
   trace_a_syscall:
         SAVE_STATIC
@@ -11246,10 +11368,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/scall_64.S linux-2.4.32-rc1.mips/a
   
         li      t0, -EMAXERRNO - 1      # error?
         sltu    t0, t0, v0
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/scall_n32.S linux-2.4.32-rc1.mips/arch/mips64/kernel/scall_n32.S
---- linux-2.4.32-rc1/arch/mips64/kernel/scall_n32.S    2005-01-19 15:09:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/scall_n32.S       2005-02-07 22:21:54.000000000 +0100
-@@ -106,15 +106,14 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/scall_n32.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_n32.S
++++ linux-2.4.35.4/arch/mips64/kernel/scall_n32.S
+@@ -106,15 +106,14 @@ n32_reschedule:
   
   trace_a_syscall:
         SAVE_STATIC
@@ -11267,10 +11390,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/scall_n32.S linux-2.4.32-rc1.mips/
   
         li      t0, -EMAXERRNO - 1      # error?
         sltu    t0, t0, v0
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/scall_o32.S linux-2.4.32-rc1.mips/arch/mips64/kernel/scall_o32.S
---- linux-2.4.32-rc1/arch/mips64/kernel/scall_o32.S    2005-01-19 15:09:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/scall_o32.S       2005-02-14 04:52:57.000000000 +0100
-@@ -118,9 +118,8 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_o32.S
++++ linux-2.4.35.4/arch/mips64/kernel/scall_o32.S
+@@ -118,9 +118,8 @@ trace_a_syscall:
         sd      a6, PT_R10(sp)
         sd      a7, PT_R11(sp)
   
@@ -11281,7 +11405,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/scall_o32.S linux-2.4.32-rc1.mips/
   
         ld      a0, PT_R4(sp)           # Restore argument registers
         ld      a1, PT_R5(sp)
-@@ -129,7 +128,7 @@
+@@ -129,7 +128,7 @@ trace_a_syscall:
         ld      a4, PT_R8(sp)
         ld      a5, PT_R9(sp)
   
@@ -11290,7 +11414,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/scall_o32.S linux-2.4.32-rc1.mips/
   
         li      t0, -EMAXERRNO - 1      # error?
         sltu    t0, t0, v0
-@@ -576,6 +575,8 @@
+@@ -576,6 +575,8 @@ out:       jr      ra
   sys_call_table:
         syscalltable
   
@@ -11299,10 +11423,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/scall_o32.S linux-2.4.32-rc1.mips/
         .macro  sys function, nargs
         .byte   \nargs
         .endm
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/setup.c linux-2.4.32-rc1.mips/arch/mips64/kernel/setup.c
---- linux-2.4.32-rc1/arch/mips64/kernel/setup.c        2005-01-19 15:09:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/setup.c   2004-11-22 14:38:26.000000000 +0100
-@@ -129,14 +129,6 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/setup.c
++++ linux-2.4.35.4/arch/mips64/kernel/setup.c
+@@ -129,14 +129,6 @@ asmlinkage void __init init_arch(int arg
          */
         load_mmu();
   
@@ -11317,10 +11442,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/setup.c linux-2.4.32-rc1.mips/arch
         start_kernel();
   }
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/signal_n32.c linux-2.4.32-rc1.mips/arch/mips64/kernel/signal_n32.c
---- linux-2.4.32-rc1/arch/mips64/kernel/signal_n32.c   2005-01-19 15:09:33.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/signal_n32.c      2005-02-07 22:10:53.000000000 +0100
-@@ -68,7 +68,7 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/signal_n32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/signal_n32.c
++++ linux-2.4.35.4/arch/mips64/kernel/signal_n32.c
+@@ -68,7 +68,7 @@ struct rt_sigframe_n32 {
   };
   
   extern asmlinkage int restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc);
@@ -11329,10 +11455,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/signal_n32.c linux-2.4.32-rc1.mips
   
   asmlinkage void sysn32_rt_sigreturn(abi64_no_regargs, struct pt_regs regs)
   {
-diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/traps.c linux-2.4.32-rc1.mips/arch/mips64/kernel/traps.c
---- linux-2.4.32-rc1/arch/mips64/kernel/traps.c        2005-01-19 15:09:33.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/kernel/traps.c   2005-04-12 22:25:34.000000000 +0200
-@@ -462,9 +462,10 @@
+Index: linux-2.4.35.4/arch/mips64/kernel/traps.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/traps.c
++++ linux-2.4.35.4/arch/mips64/kernel/traps.c
+@@ -462,9 +462,10 @@ static inline void simulate_ll(struct pt
         }
         ll_task = current;
   
@@ -11344,7 +11471,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/traps.c linux-2.4.32-rc1.mips/arch
         return;
   
   sig:
-@@ -495,8 +496,8 @@
+@@ -495,8 +496,8 @@ static inline void simulate_sc(struct pt
                 goto sig;
         }
         if (ll_bit == 0 || ll_task != current) {
@@ -11354,7 +11481,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/traps.c linux-2.4.32-rc1.mips/arch
                 return;
         }
   
-@@ -505,9 +506,9 @@
+@@ -505,9 +506,9 @@ static inline void simulate_sc(struct pt
                 goto sig;
         }
   
@@ -11365,7 +11492,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/traps.c linux-2.4.32-rc1.mips/arch
         return;
   
   sig:
-@@ -809,13 +810,18 @@
+@@ -809,13 +810,18 @@ extern asmlinkage int fpu_emulator_resto
   void __init per_cpu_trap_init(void)
   {
         unsigned int cpu = smp_processor_id();
@@ -11389,7 +11516,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/traps.c linux-2.4.32-rc1.mips/arch
   
         /*
          * Some MIPS CPUs have a dedicated interrupt vector which reduces the
-@@ -825,13 +831,11 @@
+@@ -825,13 +831,11 @@ void __init per_cpu_trap_init(void)
                 set_c0_cause(CAUSEF_IV);
   
         cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
@@ -11405,7 +11532,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/traps.c linux-2.4.32-rc1.mips/arch
         enter_lazy_tlb(&init_mm, current, cpu);
   }
   
-@@ -842,8 +846,6 @@
+@@ -842,8 +846,6 @@ void __init trap_init(void)
         extern char except_vec4;
         unsigned long i;
   
@@ -11414,7 +11541,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/traps.c linux-2.4.32-rc1.mips/arch
         /* Copy the generic exception handlers to their final destination. */
         memcpy((void *) KSEG0         , &except_vec0_generic, 0x80);
         memcpy((void *)(KSEG0 + 0x180), &except_vec3_generic, 0x80);
-@@ -933,6 +935,5 @@
+@@ -933,6 +935,5 @@ void __init trap_init(void)
   
         flush_icache_range(KSEG0, KSEG0 + 0x400);
   
@@ -11422,10 +11549,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/kernel/traps.c linux-2.4.32-rc1.mips/arch
  -      current->active_mm = &init_mm;
  +      per_cpu_trap_init();
   }
-diff -Nur linux-2.4.32-rc1/arch/mips64/mm/cerr-sb1.c linux-2.4.32-rc1.mips/arch/mips64/mm/cerr-sb1.c
---- linux-2.4.32-rc1/arch/mips64/mm/cerr-sb1.c 2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/mm/cerr-sb1.c    2004-12-13 18:37:26.000000000 +0100
-@@ -252,14 +252,14 @@
+Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/mm/cerr-sb1.c
++++ linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c
+@@ -252,14 +252,14 @@ static const uint8_t parity[256] = {
   
   /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
   static const uint64_t mask_72_64[8] = {
@@ -11448,7 +11576,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/cerr-sb1.c linux-2.4.32-rc1.mips/arch/
   };
   
   /* Calculate the parity on a range of bits */
-@@ -331,9 +331,9 @@
+@@ -331,9 +331,9 @@ static uint32_t extract_ic(unsigned shor
                                     ((lru >> 4) & 0x3),
                                     ((lru >> 6) & 0x3));
                 }
@@ -11460,7 +11588,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/cerr-sb1.c linux-2.4.32-rc1.mips/arch/
                 valid = ((taghi >> 29) & 1);
                 if (valid) {
                         tlo_tmp = taglo & 0xfff3ff;
-@@ -474,7 +474,7 @@
+@@ -474,7 +474,7 @@ static uint32_t extract_dc(unsigned shor
                 : "r" ((way << 13) | addr));
   
                 taglo = ((unsigned long long)taglohi << 32) | taglolo;
@@ -11469,10 +11597,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/cerr-sb1.c linux-2.4.32-rc1.mips/arch/
                 if (way == 0) {
                         lru = (taghi >> 14) & 0xff;
                         prom_printf("[Bank %d Set 0x%02x]  LRU > %d %d %d %d > MRU\n",
-diff -Nur linux-2.4.32-rc1/arch/mips64/mm/c-r4k.c linux-2.4.32-rc1.mips/arch/mips64/mm/c-r4k.c
---- linux-2.4.32-rc1/arch/mips64/mm/c-r4k.c    2005-01-19 15:09:33.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/mm/c-r4k.c       2005-02-06 22:55:42.000000000 +0100
-@@ -867,9 +867,16 @@
+Index: linux-2.4.35.4/arch/mips64/mm/c-r4k.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/mm/c-r4k.c
++++ linux-2.4.35.4/arch/mips64/mm/c-r4k.c
+@@ -867,9 +867,16 @@ static void __init probe_pcache(void)
          * normally they'd suffer from aliases but magic in the hardware deals
          * with that for us so we don't need to take care ourselves.
          */
@@ -11492,7 +11621,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/c-r4k.c linux-2.4.32-rc1.mips/arch/mip
   
         switch (c->cputype) {
         case CPU_20KC:
-@@ -1070,9 +1077,6 @@
+@@ -1070,9 +1077,6 @@ void __init ld_mmu_r4xx0(void)
         setup_scache();
         coherency_setup();
   
@@ -11502,10 +11631,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/c-r4k.c linux-2.4.32-rc1.mips/arch/mip
         r4k_blast_dcache_page_setup();
         r4k_blast_dcache_page_indexed_setup();
         r4k_blast_dcache_setup();
-diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch/mips64/mm/tlbex-r4k.S
---- linux-2.4.32-rc1/arch/mips64/mm/tlbex-r4k.S        2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/mm/tlbex-r4k.S   2005-06-06 16:46:22.000000000 +0200
-@@ -125,6 +125,33 @@
+Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/mm/tlbex-r4k.S
++++ linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S
+@@ -125,6 +125,33 @@ LEAF(except_vec1_r4k)
          nop
   END(except_vec1_r4k)
   
@@ -11539,7 +11669,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch
   LEAF(except_vec1_sb1)
   #if BCM1250_M3_WAR
         dmfc0   k0, CP0_BADVADDR
-@@ -134,28 +161,24 @@
+@@ -134,28 +161,24 @@ LEAF(except_vec1_sb1)
         bnez    k0, 1f
   #endif
         .set    noat
@@ -11572,7 +11702,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch
         eret
   
   9:                                            # handle the vmalloc range
-@@ -163,13 +186,10 @@
+@@ -163,13 +186,10 @@ LEAF(handle_vec1_r4k)
         ld      k0, 0(k1)                       # get even pte
         ld      k1, 8(k1)                       # get odd pte
         PTE_RELOAD k0 k1
@@ -11589,7 +11719,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch
   
   
         __INIT
-@@ -195,10 +215,8 @@
+@@ -195,10 +215,8 @@ LEAF(handle_vec1_r10k)
         ld      k0, 0(k1)                       # get even pte
         ld      k1, 8(k1)                       # get odd pte
         PTE_RELOAD k0 k1
@@ -11601,7 +11731,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch
         eret
   
   9:                                            # handle the vmalloc range
-@@ -206,10 +224,8 @@
+@@ -206,10 +224,8 @@ LEAF(handle_vec1_r10k)
         ld      k0, 0(k1)                       # get even pte
         ld      k1, 8(k1)                       # get odd pte
         PTE_RELOAD k0 k1
@@ -11613,9 +11743,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlbex-r4k.S linux-2.4.32-rc1.mips/arch
         eret
   END(handle_vec1_r10k)
   
-diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/mips64/mm/tlb-r4k.c
---- linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c  2005-01-19 15:09:33.000000000 +0100
-+++ linux-2.4.32-rc1.mips/arch/mips64/mm/tlb-r4k.c     2004-11-25 23:18:38.000000000 +0100
+Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/mm/tlb-r4k.c
++++ linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c
  @@ -1,24 +1,12 @@
   /*
  - * Carsten Langgaard, carstenl@mips.com
@@ -11657,7 +11788,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
   extern void except_vec1_r4k(void);
   
   /* CP0 hazard avoidance. */
-@@ -46,31 +31,23 @@
+@@ -46,31 +31,23 @@ void local_flush_tlb_all(void)
         unsigned long old_ctx;
         int entry;
   
@@ -11693,7 +11824,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
         write_c0_entryhi(old_ctx);
         local_irq_restore(flags);
   }
-@@ -79,12 +56,8 @@
+@@ -79,12 +56,8 @@ void local_flush_tlb_mm(struct mm_struct
   {
         int cpu = smp_processor_id();
   
@@ -11707,7 +11838,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
   }
   
   void local_flush_tlb_range(struct mm_struct *mm, unsigned long start,
-@@ -96,10 +69,6 @@
+@@ -96,10 +69,6 @@ void local_flush_tlb_range(struct mm_str
                 unsigned long flags;
                 int size;
   
@@ -11718,7 +11849,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
                 local_irq_save(flags);
                 size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
                 size = (size + 1) >> 1;
-@@ -110,25 +79,25 @@
+@@ -110,25 +79,25 @@ void local_flush_tlb_range(struct mm_str
                         start &= (PAGE_MASK << 1);
                         end += ((PAGE_SIZE << 1) - 1);
                         end &= (PAGE_MASK << 1);
@@ -11749,7 +11880,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
                         write_c0_entryhi(oldpid);
                 } else {
                         drop_mmu_context(mm, cpu);
-@@ -145,28 +114,26 @@
+@@ -145,28 +114,26 @@ void local_flush_tlb_page(struct vm_area
                 unsigned long flags;
                 unsigned long oldpid, newpid, idx;
   
@@ -11783,7 +11914,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
                 write_c0_entryhi(oldpid);
                 local_irq_restore(flags);
         }
-@@ -186,7 +153,7 @@
+@@ -186,7 +153,7 @@ void local_flush_tlb_one(unsigned long p
   
         local_irq_save(flags);
         write_c0_entryhi(page);
@@ -11792,7 +11923,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
         tlb_probe();
         BARRIER;
         idx = read_c0_index();
-@@ -195,10 +162,12 @@
+@@ -195,10 +162,12 @@ void local_flush_tlb_one(unsigned long p
         if (idx >= 0) {
                 /* Make sure all entries differ. */
                 write_c0_entryhi(KSEG0+idx*0x2000);
@@ -11806,7 +11937,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
         local_irq_restore(flags);
   }
   
-@@ -208,7 +177,6 @@
+@@ -208,7 +177,6 @@ void local_flush_tlb_one(unsigned long p
   void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
   {
         unsigned long flags;
@@ -11814,7 +11945,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
         pgd_t *pgdp;
         pmd_t *pmdp;
         pte_t *ptep;
-@@ -222,70 +190,58 @@
+@@ -222,70 +190,58 @@ void __update_tlb(struct vm_area_struct 
   
         pid = read_c0_entryhi() & ASID_MASK;
   
@@ -11920,7 +12051,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
   }
   
   /*
-@@ -317,17 +273,15 @@
+@@ -317,17 +273,15 @@ __init int add_temporary_entry(unsigned 
         }
   
         write_c0_index(temp_tlb_entry);
@@ -11940,7 +12071,7 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
         write_c0_pagemask(old_pagemask);
   out:
         local_irq_restore(flags);
-@@ -348,15 +302,23 @@
+@@ -348,15 +302,23 @@ static void __init probe_tlb(unsigned lo
                 return;
   
         config1 = read_c0_config1();
@@ -11967,10 +12098,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips64/mm/tlb-r4k.c linux-2.4.32-rc1.mips/arch/m
         probe_tlb(config);
         write_c0_pagemask(PM_DEFAULT_MASK);
         write_c0_wired(0);
-diff -Nur linux-2.4.32-rc1/drivers/char/au1000_gpio.c linux-2.4.32-rc1.mips/drivers/char/au1000_gpio.c
---- linux-2.4.32-rc1/drivers/char/au1000_gpio.c        2003-08-25 13:44:41.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/char/au1000_gpio.c   2003-12-20 14:18:51.000000000 +0100
-@@ -246,7 +246,7 @@
+Index: linux-2.4.35.4/drivers/char/au1000_gpio.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/au1000_gpio.c
++++ linux-2.4.35.4/drivers/char/au1000_gpio.c
+@@ -246,7 +246,7 @@ static struct file_operations au1000gpio
   
   static struct miscdevice au1000gpio_miscdev =
   {
@@ -11979,9 +12111,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/au1000_gpio.c linux-2.4.32-rc1.mips/driv
         "au1000_gpio",
         &au1000gpio_fops
   };
-diff -Nur linux-2.4.32-rc1/drivers/char/au1550_psc_spi.c linux-2.4.32-rc1.mips/drivers/char/au1550_psc_spi.c
---- linux-2.4.32-rc1/drivers/char/au1550_psc_spi.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/char/au1550_psc_spi.c        2005-02-11 21:37:24.000000000 +0100
+Index: linux-2.4.35.4/drivers/char/au1550_psc_spi.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/char/au1550_psc_spi.c
  @@ -0,0 +1,466 @@
  +/*
  + *  Driver for Alchemy Au1550 SPI on the PSC.
@@ -12449,10 +12582,11 @@ diff -Nur linux-2.4.32-rc1/drivers/char/au1550_psc_spi.c linux-2.4.32-rc1.mips/d
  +
  +module_init(au1550spi_init);
  +module_exit(au1550spi_exit);
-diff -Nur linux-2.4.32-rc1/drivers/char/Config.in linux-2.4.32-rc1.mips/drivers/char/Config.in
---- linux-2.4.32-rc1/drivers/char/Config.in    2004-08-08 01:26:04.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/char/Config.in       2005-02-11 22:09:56.000000000 +0100
-@@ -313,14 +313,11 @@
+Index: linux-2.4.35.4/drivers/char/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/Config.in
++++ linux-2.4.35.4/drivers/char/Config.in
+@@ -314,14 +314,11 @@ fi
   if [ "$CONFIG_OBSOLETE" = "y" -a "$CONFIG_ALPHA_BOOK1" = "y" ]; then
      bool 'Tadpole ANA H8 Support (OBSOLETE)'  CONFIG_H8
   fi
@@ -12469,7 +12603,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/Config.in linux-2.4.32-rc1.mips/drivers/
   fi
   if [ "$CONFIG_TOSHIBA_RBTX4927" = "y" -o "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
      tristate 'Dallas DS1742 RTC support' CONFIG_DS1742
-@@ -383,6 +380,11 @@
+@@ -384,6 +381,11 @@ if [ "$CONFIG_DRM" = "y" ]; then
         source drivers/char/drm/Config.in
      fi
   fi
@@ -12481,7 +12615,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/Config.in linux-2.4.32-rc1.mips/drivers/
   endmenu
   
   if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
-@@ -391,6 +393,7 @@
+@@ -392,6 +394,7 @@ fi
   if [ "$CONFIG_SOC_AU1X00" = "y" ]; then
      tristate ' Alchemy Au1x00 GPIO device support' CONFIG_AU1X00_GPIO
      tristate ' Au1000/ADS7846 touchscreen support' CONFIG_TS_AU1X00_ADS7846
@@ -12489,9 +12623,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/Config.in linux-2.4.32-rc1.mips/drivers/
   fi
   if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
     tristate ' ITE GPIO' CONFIG_ITE_GPIO
-diff -Nur linux-2.4.32-rc1/drivers/char/decserial.c linux-2.4.32-rc1.mips/drivers/char/decserial.c
---- linux-2.4.32-rc1/drivers/char/decserial.c  2003-08-25 13:44:41.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/char/decserial.c     2004-09-28 02:53:01.000000000 +0200
+Index: linux-2.4.35.4/drivers/char/decserial.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/decserial.c
++++ linux-2.4.35.4/drivers/char/decserial.c
  @@ -3,95 +3,105 @@
    *      choose the right serial device at boot time
    *
@@ -12642,9 +12777,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/decserial.c linux-2.4.32-rc1.mips/driver
   #endif
   }
   
-diff -Nur linux-2.4.32-rc1/drivers/char/ds1286.c linux-2.4.32-rc1.mips/drivers/char/ds1286.c
---- linux-2.4.32-rc1/drivers/char/ds1286.c     2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/char/ds1286.c        2004-01-10 06:21:39.000000000 +0100
+Index: linux-2.4.35.4/drivers/char/ds1286.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/ds1286.c
++++ linux-2.4.35.4/drivers/char/ds1286.c
  @@ -1,6 +1,10 @@
   /*
    * DS1286 Real Time Clock interface for Linux
@@ -12664,7 +12800,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ds1286.c linux-2.4.32-rc1.mips/drivers/c
   #include <linux/slab.h>
   #include <linux/ioport.h>
   #include <linux/fcntl.h>
-@@ -95,6 +100,12 @@
+@@ -95,6 +100,12 @@ static ssize_t ds1286_read(struct file *
         return -EIO;
   }
   
@@ -12677,7 +12813,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ds1286.c linux-2.4.32-rc1.mips/drivers/c
   static int ds1286_ioctl(struct inode *inode, struct file *file,
                           unsigned int cmd, unsigned long arg)
   {
-@@ -249,23 +260,22 @@
+@@ -249,23 +260,22 @@ static int ds1286_open(struct inode *ino
   {
         spin_lock_irq(&ds1286_lock);
   
@@ -12708,7 +12844,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ds1286.c linux-2.4.32-rc1.mips/drivers/c
         return 0;
   }
   
-@@ -276,32 +286,6 @@
+@@ -276,32 +286,6 @@ static unsigned int ds1286_poll(struct f
         return 0;
   }
   
@@ -12741,7 +12877,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ds1286.c linux-2.4.32-rc1.mips/drivers/c
   static char *days[] = {
         "***", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
   };
-@@ -528,3 +512,38 @@
+@@ -528,3 +512,38 @@ void ds1286_get_alm_time(struct rtc_time
         BCD_TO_BIN(alm_tm->tm_hour);
         alm_tm->tm_sec = 0;
   }
@@ -12780,10 +12916,11 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ds1286.c linux-2.4.32-rc1.mips/drivers/c
  +
  +MODULE_AUTHOR("Ralf Baechle");
  +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/char/ds1742.c linux-2.4.32-rc1.mips/drivers/char/ds1742.c
---- linux-2.4.32-rc1/drivers/char/ds1742.c     2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/char/ds1742.c        2004-01-09 20:27:16.000000000 +0100
-@@ -142,6 +142,7 @@
+Index: linux-2.4.35.4/drivers/char/ds1742.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/ds1742.c
++++ linux-2.4.35.4/drivers/char/ds1742.c
+@@ -142,6 +142,7 @@ static int rtc_ds1742_set_time(unsigned 
         CMOS_WRITE(RTC_WRITE, RTC_CONTROL);
   
         /* convert */
@@ -12791,7 +12928,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ds1742.c linux-2.4.32-rc1.mips/drivers/c
         to_tm(t, &tm);
   
         /* check each field one by one */
-@@ -216,6 +217,7 @@
+@@ -216,6 +217,7 @@ static int get_ds1742_status(char *buf)
         unsigned long curr_time;
   
         curr_time = rtc_ds1742_get_time();
@@ -12799,7 +12936,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ds1742.c linux-2.4.32-rc1.mips/drivers/c
         to_tm(curr_time, &tm);
   
         p = buf;
-@@ -251,8 +253,8 @@
+@@ -251,8 +253,8 @@ static int ds1742_read_proc(char *page, 
   
   void rtc_ds1742_wait(void)
   {
@@ -12810,7 +12947,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ds1742.c linux-2.4.32-rc1.mips/drivers/c
   }
   
   static int ds1742_ioctl(struct inode *inode, struct file *file,
-@@ -264,6 +266,7 @@
+@@ -264,6 +266,7 @@ static int ds1742_ioctl(struct inode *in
         switch (cmd) {
         case RTC_RD_TIME:       /* Read the time/date from RTC  */
                 curr_time = rtc_ds1742_get_time();
@@ -12818,10 +12955,11 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ds1742.c linux-2.4.32-rc1.mips/drivers/c
                 to_tm(curr_time, &rtc_tm);
                 rtc_tm.tm_year -= 1900;
                 return copy_to_user((void *) arg, &rtc_tm, sizeof(rtc_tm)) ? 
-diff -Nur linux-2.4.32-rc1/drivers/char/dummy_keyb.c linux-2.4.32-rc1.mips/drivers/char/dummy_keyb.c
---- linux-2.4.32-rc1/drivers/char/dummy_keyb.c 2003-08-25 13:44:41.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/char/dummy_keyb.c    2004-01-09 09:53:08.000000000 +0100
-@@ -140,3 +140,7 @@
+Index: linux-2.4.35.4/drivers/char/dummy_keyb.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/dummy_keyb.c
++++ linux-2.4.35.4/drivers/char/dummy_keyb.c
+@@ -141,3 +141,7 @@ void __init kbd_init_hw(void)
   {
         printk("Dummy keyboard driver installed.\n");
   }
@@ -12829,9 +12967,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dummy_keyb.c linux-2.4.32-rc1.mips/drive
  +unsigned char kbd_sysrq_key;
  +unsigned char kbd_sysrq_xlate[128];
  +#endif
-diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/dz.c
---- linux-2.4.32-rc1/drivers/char/dz.c 2005-01-19 15:09:44.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/char/dz.c    2004-12-27 05:13:42.000000000 +0100
+Index: linux-2.4.35.4/drivers/char/dz.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/dz.c
++++ linux-2.4.35.4/drivers/char/dz.c
  @@ -1,11 +1,13 @@
   /*
  - * dz.c: Serial port driver for DECStations equiped 
@@ -12928,7 +13067,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
   /*
    * ------------------------------------------------------------
    * dz_in () and dz_out ()
-@@ -94,15 +120,16 @@
+@@ -94,15 +120,16 @@ static inline unsigned short dz_in(struc
   {
         volatile unsigned short *addr =
                 (volatile unsigned short *) (info->port + offset);
@@ -12946,7 +13085,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
         *addr = value;
   }
   
-@@ -143,25 +170,24 @@
+@@ -143,25 +170,24 @@ static void dz_start(struct tty_struct *
   
         tmp |= mask;            /* set the TX flag */
         dz_out(info, DZ_TCR, tmp);
@@ -12979,7 +13118,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
    *
    * ------------------------------------------------------------
    */
-@@ -188,101 +214,97 @@
+@@ -188,101 +214,97 @@ static inline void dz_sched_event(struct
    * This routine deals with inputs from any lines.
    * ------------------------------------------------------------
    */
@@ -13156,7 +13295,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
   }
   
   /*
-@@ -292,20 +314,34 @@
+@@ -292,20 +314,34 @@ static inline void receive_chars(struct 
    * This routine deals with outputs to any lines.
    * ------------------------------------------------------------
    */
@@ -13194,7 +13333,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
                 dz_stop(info->tty);
                 return;
         }
-@@ -359,15 +395,14 @@
+@@ -359,15 +395,14 @@ static inline void check_modem_status(st
    */
   static void dz_interrupt(int irq, void *dev, struct pt_regs *regs)
   {
@@ -13213,7 +13352,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
   
         if (status & DZ_TRDY)
                 transmit_chars(info);
-@@ -514,7 +549,7 @@
+@@ -514,7 +549,7 @@ static void shutdown(struct dz_serial *i
   
   
         info->cflags &= ~DZ_CREAD;      /* turn off receive enable flag */
@@ -13222,7 +13361,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
   
         if (info->xmit_buf) {   /* free Tx buffer */
                 free_page((unsigned long) info->xmit_buf);
-@@ -545,18 +580,21 @@
+@@ -545,18 +580,21 @@ static void change_speed(struct dz_seria
   {
         unsigned long flags;
         unsigned cflag;
@@ -13249,7 +13388,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
         switch (cflag & CSIZE) {
         case CS5:
                 info->cflags |= DZ_CS5;
-@@ -579,7 +617,16 @@
+@@ -579,7 +617,16 @@ static void change_speed(struct dz_seria
         if (cflag & PARODD)
                 info->cflags |= DZ_PARODD;
   
@@ -13267,7 +13406,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
         switch (baud) {
         case 50:
                 info->cflags |= DZ_B50;
-@@ -629,16 +676,16 @@
+@@ -629,16 +676,16 @@ static void change_speed(struct dz_seria
         }
   
         info->cflags |= DZ_RXENAB;
@@ -13287,7 +13426,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
                 info->ignore_status_mask |= (DZ_FERR | DZ_PERR);
   
         restore_flags(flags);
-@@ -694,7 +741,7 @@
+@@ -694,7 +741,7 @@ static int dz_write(struct tty_struct *t
   
                 down(&tmp_buf_sem);
                 while (1) {
@@ -13296,7 +13435,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
                         if (c <= 0)
                                 break;
   
-@@ -707,7 +754,7 @@
+@@ -707,7 +754,7 @@ static int dz_write(struct tty_struct *t
                         save_flags(flags);
                         cli();
   
@@ -13305,7 +13444,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
                         memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
                         info->xmit_head = ((info->xmit_head + c) & (DZ_XMIT_SIZE - 1));
                         info->xmit_cnt += c;
-@@ -727,7 +774,7 @@
+@@ -727,7 +774,7 @@ static int dz_write(struct tty_struct *t
                         save_flags(flags);
                         cli();
   
@@ -13314,7 +13453,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
                         if (c <= 0) {
                                 restore_flags(flags);
                                 break;
-@@ -845,7 +892,7 @@
+@@ -845,7 +892,7 @@ static void dz_send_xchar(struct tty_str
   
   /*
    * ------------------------------------------------------------
@@ -13323,7 +13462,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
    * ------------------------------------------------------------
    */
   static int get_serial_info(struct dz_serial *info,
-@@ -958,6 +1005,9 @@
+@@ -958,6 +1005,9 @@ static int dz_ioctl(struct tty_struct *t
         struct dz_serial *info = (struct dz_serial *) tty->driver_data;
         int retval;
   
@@ -13333,7 +13472,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
         if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
             (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD) &&
             (cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) {
-@@ -1252,19 +1302,14 @@
+@@ -1252,19 +1302,14 @@ static int dz_open(struct tty_struct *tt
         int retval, line;
   
         line = MINOR(tty->device) - tty->driver.minor_start;
@@ -13355,7 +13494,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
         tty->driver_data = info;
         info->tty = tty;
   
-@@ -1285,14 +1330,21 @@
+@@ -1285,14 +1330,21 @@ static int dz_open(struct tty_struct *tt
                 else
                         *tty->termios = info->callout_termios;
                 change_speed(info);
@@ -13379,7 +13518,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
   {
         printk("%s%s\n", dz_name, dz_version);
   }
-@@ -1300,7 +1352,6 @@
+@@ -1300,7 +1352,6 @@ static void show_serial_version(void)
   int __init dz_init(void)
   {
         int i;
@@ -13387,7 +13526,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
         struct dz_serial *info;
   
         /* Setup base handler, and timer table. */
-@@ -1311,9 +1362,9 @@
+@@ -1311,9 +1362,9 @@ int __init dz_init(void)
         memset(&serial_driver, 0, sizeof(struct tty_driver));
         serial_driver.magic = TTY_DRIVER_MAGIC;
   #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS))
@@ -13399,7 +13538,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
   #endif
         serial_driver.major = TTY_MAJOR;
         serial_driver.minor_start = 64;
-@@ -1352,9 +1403,9 @@
+@@ -1352,9 +1403,9 @@ int __init dz_init(void)
          */
         callout_driver = serial_driver;
   #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS))
@@ -13411,7 +13550,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
   #endif
         callout_driver.major = TTYAUX_MAJOR;
         callout_driver.subtype = SERIAL_TYPE_CALLOUT;
-@@ -1363,25 +1414,27 @@
+@@ -1363,25 +1414,27 @@ int __init dz_init(void)
                 panic("Couldn't register serial driver");
         if (tty_register_driver(&callout_driver))
                 panic("Couldn't register callout driver");
@@ -13446,7 +13585,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
                 info->event = 0;
                 info->count = 0;
                 info->blocked_open = 0;
-@@ -1393,25 +1446,16 @@
+@@ -1393,25 +1446,16 @@ int __init dz_init(void)
                 info->normal_termios = serial_driver.init_termios;
                 init_waitqueue_head(&info->open_wait);
                 init_waitqueue_head(&info->close_wait);
@@ -13477,7 +13616,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
         dz_out(info, DZ_CSR, DZ_CLR);
         while (dz_in(info, DZ_CSR) & DZ_CLR);
         iob();
-@@ -1420,43 +1464,104 @@
+@@ -1420,43 +1464,104 @@ int __init dz_init(void)
         dz_out(info, DZ_CSR, DZ_MSE);
   #endif
   
@@ -13604,7 +13743,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
   /* 
    * -------------------------------------------------------------------
    * dz_console_print ()
-@@ -1465,17 +1570,19 @@
+@@ -1465,17 +1570,19 @@ static void dz_console_put_char(unsigned
    * The console must be locked when we get here.
    * ------------------------------------------------------------------- 
    */
@@ -13627,7 +13766,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
         }
   }
   
-@@ -1486,12 +1593,12 @@
+@@ -1486,12 +1593,12 @@ static kdev_t dz_console_device(struct c
   
   static int __init dz_console_setup(struct console *co, char *options)
   {
@@ -13641,7 +13780,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
   
         if (options) {
                 baud = simple_strtoul(options, NULL, 10);
-@@ -1542,44 +1649,31 @@
+@@ -1542,44 +1649,31 @@ static int __init dz_console_setup(struc
         }
         co->cflag = cflag;
   
@@ -13701,9 +13840,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.c linux-2.4.32-rc1.mips/drivers/char/
   };
   
   void __init dz_serial_console_init(void)
-diff -Nur linux-2.4.32-rc1/drivers/char/dz.h linux-2.4.32-rc1.mips/drivers/char/dz.h
---- linux-2.4.32-rc1/drivers/char/dz.h 2002-08-03 02:39:43.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/char/dz.h    2004-09-28 02:53:01.000000000 +0200
+Index: linux-2.4.35.4/drivers/char/dz.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/dz.h
++++ linux-2.4.35.4/drivers/char/dz.h
  @@ -10,6 +10,8 @@
   #ifndef DZ_SERIAL_H
   #define DZ_SERIAL_H
@@ -13771,7 +13911,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.h linux-2.4.32-rc1.mips/drivers/char/
   #define DZ_SPLIT_TERMIOS   0x0008 /* Separate termios for dialin/callout */
   #define DZ_SESSION_LOCKOUT 0x0100 /* Lock out cua opens based on session */
   #define DZ_PGRP_LOCKOUT    0x0200 /* Lock out cua opens based on pgrp */
-@@ -166,79 +178,9 @@
+@@ -166,79 +178,9 @@ struct dz_serial {
     long                    session;             /* Session of opening process */
     long                    pgrp;                /* pgrp of opening process */
   
@@ -13852,9 +13992,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/dz.h linux-2.4.32-rc1.mips/drivers/char/
  -#endif
  -
   #endif /* DZ_SERIAL_H */
-diff -Nur linux-2.4.32-rc1/drivers/char/ibm_workpad_keymap.map linux-2.4.32-rc1.mips/drivers/char/ibm_workpad_keymap.map
---- linux-2.4.32-rc1/drivers/char/ibm_workpad_keymap.map       1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/char/ibm_workpad_keymap.map  2003-12-20 15:20:44.000000000 +0100
+Index: linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map
  @@ -0,0 +1,343 @@
  +# Keymap for IBM Workpad z50
  +# US Mapping
@@ -14199,9 +14340,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ibm_workpad_keymap.map linux-2.4.32-rc1.
  +keycode 93 = AltGr
  +keycode 94 = ShiftR
  +      shift keycode 94 = Caps_Lock
-diff -Nur linux-2.4.32-rc1/drivers/char/indydog.c linux-2.4.32-rc1.mips/drivers/char/indydog.c
---- linux-2.4.32-rc1/drivers/char/indydog.c    2003-08-25 13:44:41.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/char/indydog.c       2004-06-22 17:32:07.000000000 +0200
+Index: linux-2.4.35.4/drivers/char/indydog.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/indydog.c
++++ linux-2.4.35.4/drivers/char/indydog.c
  @@ -1,5 +1,5 @@
   /*
  - *    IndyDog 0.2     A Hardware Watchdog Device for SGI IP22
@@ -14238,7 +14380,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/indydog.c linux-2.4.32-rc1.mips/drivers/
   
   #ifdef CONFIG_WATCHDOG_NOWAYOUT
   static int nowayout = 1;
-@@ -33,10 +32,30 @@
+@@ -33,10 +32,30 @@ static int nowayout = 1;
   static int nowayout = 0;
   #endif
   
@@ -14270,7 +14412,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/indydog.c linux-2.4.32-rc1.mips/drivers/
   {
         sgimc->watchdogt = 0;
   }
-@@ -46,18 +65,14 @@
+@@ -46,18 +65,14 @@ static inline void indydog_ping(void)
    */
   static int indydog_open(struct inode *inode, struct file *file)
   {
@@ -14292,7 +14434,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/indydog.c linux-2.4.32-rc1.mips/drivers/
         indydog_ping();
                         
         indydog_alive = 1;
-@@ -69,63 +84,48 @@
+@@ -69,63 +84,48 @@ static int indydog_open(struct inode *in
   static int indydog_release(struct inode *inode, struct file *file)
   {
         /* Shut off the timer.
@@ -14372,7 +14514,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/indydog.c linux-2.4.32-rc1.mips/drivers/
                                 return -EFAULT;
                         return 0;
                 case WDIOC_GETSTATUS:
-@@ -134,31 +134,53 @@
+@@ -134,31 +134,53 @@ static int indydog_ioctl(struct inode *i
                 case WDIOC_KEEPALIVE:
                         indydog_ping();
                         return 0;
@@ -14437,7 +14579,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/indydog.c linux-2.4.32-rc1.mips/drivers/
   
         printk(banner);
   
-@@ -172,4 +194,7 @@
+@@ -172,4 +194,7 @@ static void __exit watchdog_exit(void)
   
   module_init(watchdog_init);
   module_exit(watchdog_exit);
@@ -14445,9 +14587,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/indydog.c linux-2.4.32-rc1.mips/drivers/
  +MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>");
  +MODULE_DESCRIPTION("Hardware Watchdog Device for SGI IP22");
   MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/char/ip27-rtc.c linux-2.4.32-rc1.mips/drivers/char/ip27-rtc.c
---- linux-2.4.32-rc1/drivers/char/ip27-rtc.c   2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/char/ip27-rtc.c      2004-04-06 03:35:30.000000000 +0200
+Index: linux-2.4.35.4/drivers/char/ip27-rtc.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/ip27-rtc.c
++++ linux-2.4.35.4/drivers/char/ip27-rtc.c
  @@ -44,6 +44,7 @@
   #include <asm/sn/klconfig.h>
   #include <asm/sn/sn0/ip27.h>
@@ -14456,7 +14599,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ip27-rtc.c linux-2.4.32-rc1.mips/drivers
   
   static int rtc_ioctl(struct inode *inode, struct file *file,
                      unsigned int cmd, unsigned long arg);
-@@ -209,11 +210,8 @@
+@@ -209,11 +210,8 @@ static struct miscdevice rtc_dev=
   
   static int __init rtc_init(void)
   {
@@ -14469,7 +14612,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ip27-rtc.c linux-2.4.32-rc1.mips/drivers
   
         printk(KERN_INFO "Real Time Clock Driver v%s\n", RTC_VERSION);
         if (misc_register(&rtc_dev)) {
-@@ -325,3 +323,7 @@
+@@ -325,3 +323,7 @@ static void get_rtc_time(struct rtc_time
   
         rtc_tm->tm_mon--;
   }
@@ -14477,10 +14620,11 @@ diff -Nur linux-2.4.32-rc1/drivers/char/ip27-rtc.c linux-2.4.32-rc1.mips/drivers
  +MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
  +MODULE_DESCRIPTION("SGI IP27 M48T35 RTC driver");
  +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/char/Makefile linux-2.4.32-rc1.mips/drivers/char/Makefile
---- linux-2.4.32-rc1/drivers/char/Makefile     2004-08-08 01:26:04.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/char/Makefile        2005-02-11 22:09:56.000000000 +0100
-@@ -48,7 +48,12 @@
+Index: linux-2.4.35.4/drivers/char/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/Makefile
++++ linux-2.4.35.4/drivers/char/Makefile
+@@ -48,7 +48,12 @@ ifeq ($(ARCH),mips)
       KEYBD    =
     endif
     ifeq ($(CONFIG_VR41XX_KIU),y)
@@ -14494,7 +14638,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/Makefile linux-2.4.32-rc1.mips/drivers/c
       KEYBD    = vr41xx_keyb.o
     endif
   endif
-@@ -251,7 +256,6 @@
+@@ -251,7 +256,6 @@ obj-$(CONFIG_MK712_MOUSE) += mk712.o
   obj-$(CONFIG_RTC) += rtc.o
   obj-$(CONFIG_GEN_RTC) += genrtc.o
   obj-$(CONFIG_EFI_RTC) += efirtc.o
@@ -14502,7 +14646,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/Makefile linux-2.4.32-rc1.mips/drivers/c
   obj-$(CONFIG_MIPS_RTC) += mips_rtc.o
   obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o
   ifeq ($(CONFIG_PPC),)
-@@ -259,6 +263,7 @@
+@@ -259,6 +263,7 @@ ifeq ($(CONFIG_PPC),)
   endif
   obj-$(CONFIG_TOSHIBA) += toshiba.o
   obj-$(CONFIG_I8K) += i8k.o
@@ -14510,7 +14654,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/Makefile linux-2.4.32-rc1.mips/drivers/c
   obj-$(CONFIG_DS1620) += ds1620.o
   obj-$(CONFIG_DS1742) += ds1742.o
   obj-$(CONFIG_INTEL_RNG) += i810_rng.o
-@@ -269,6 +274,7 @@
+@@ -269,6 +274,7 @@ obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
   
   obj-$(CONFIG_ITE_GPIO) += ite_gpio.o
   obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o
@@ -14518,7 +14662,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/Makefile linux-2.4.32-rc1.mips/drivers/c
   obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o
   obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o
   obj-$(CONFIG_COBALT_LCD) += lcd.o
-@@ -353,3 +359,9 @@
+@@ -355,3 +361,9 @@ defkeymap.c: defkeymap.map
   
   qtronixmap.c: qtronixmap.map
         set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
@@ -14528,9 +14672,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/Makefile linux-2.4.32-rc1.mips/drivers/c
  +
  +victor_mpc30x_keymap.c: victor_mpc30x_keymap.map
  +      set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
-diff -Nur linux-2.4.32-rc1/drivers/char/mips_rtc.c linux-2.4.32-rc1.mips/drivers/char/mips_rtc.c
---- linux-2.4.32-rc1/drivers/char/mips_rtc.c   2004-01-05 14:53:56.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/char/mips_rtc.c      2004-06-28 14:54:53.000000000 +0200
+Index: linux-2.4.35.4/drivers/char/mips_rtc.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/mips_rtc.c
++++ linux-2.4.35.4/drivers/char/mips_rtc.c
  @@ -53,14 +53,6 @@
   #include <asm/io.h>
   #include <asm/uaccess.h>
@@ -14546,10 +14691,11 @@ diff -Nur linux-2.4.32-rc1/drivers/char/mips_rtc.c linux-2.4.32-rc1.mips/drivers
   #include <asm/time.h>
   
   static unsigned long rtc_status = 0;  /* bitmapped status byte.       */
-diff -Nur linux-2.4.32-rc1/drivers/char/sb1250_duart.c linux-2.4.32-rc1.mips/drivers/char/sb1250_duart.c
---- linux-2.4.32-rc1/drivers/char/sb1250_duart.c       2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/char/sb1250_duart.c  2004-09-17 01:25:44.000000000 +0200
-@@ -328,10 +328,11 @@
+Index: linux-2.4.35.4/drivers/char/sb1250_duart.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/sb1250_duart.c
++++ linux-2.4.35.4/drivers/char/sb1250_duart.c
+@@ -328,10 +328,11 @@ static int duart_write(struct tty_struct
                 if (c <= 0) break;
   
                 if (from_user) {
@@ -14562,7 +14708,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/sb1250_duart.c linux-2.4.32-rc1.mips/dri
                 } else {
                         memcpy(us->outp_buf + us->outp_tail, buf, c);
                 }
-@@ -498,9 +499,31 @@
+@@ -498,9 +499,31 @@ static void duart_set_termios(struct tty
         duart_set_cflag(us->line, tty->termios->c_cflag);
   }
   
@@ -14594,7 +14740,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/sb1250_duart.c linux-2.4.32-rc1.mips/dri
   /*    if (serial_paranoia_check(info, tty->device, "rs_ioctl"))
         return -ENODEV;*/
         switch (cmd) {
-@@ -517,7 +540,7 @@
+@@ -517,7 +540,7 @@ static int duart_ioctl(struct tty_struct
                 printk("Ignoring TIOCMSET\n");
                 break;
         case TIOCGSERIAL:
@@ -14603,9 +14749,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/sb1250_duart.c linux-2.4.32-rc1.mips/dri
                 break;
         case TIOCSSERIAL:
                 printk("Ignoring TIOCSSERIAL\n");
-diff -Nur linux-2.4.32-rc1/drivers/char/serial.c linux-2.4.32-rc1.mips/drivers/char/serial.c
---- linux-2.4.32-rc1/drivers/char/serial.c     2005-10-24 11:33:29.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/char/serial.c        2005-09-23 22:41:22.000000000 +0200
+Index: linux-2.4.35.4/drivers/char/serial.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/serial.c
++++ linux-2.4.35.4/drivers/char/serial.c
  @@ -62,6 +62,12 @@
    *        Robert Schwebel <robert@schwebel.de>,
    *        Juergen Beisert <jbeisert@eurodsn.de>,
@@ -14619,7 +14766,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/serial.c linux-2.4.32-rc1.mips/drivers/c
    */
   
   static char *serial_version = "5.05c";
-@@ -413,6 +419,22 @@
+@@ -413,6 +419,22 @@ static inline int serial_paranoia_check(
         return 0;
   }
   
@@ -14642,7 +14789,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/serial.c linux-2.4.32-rc1.mips/drivers/c
   static _INLINE_ unsigned int serial_in(struct async_struct *info, int offset)
   {
         switch (info->io_type) {
-@@ -447,6 +469,8 @@
+@@ -447,6 +469,8 @@ static _INLINE_ void serial_out(struct a
                 outb(value, info->port+offset);
         }
   }
@@ -14651,9 +14798,10 @@ diff -Nur linux-2.4.32-rc1/drivers/char/serial.c linux-2.4.32-rc1.mips/drivers/c
   
   /*
    * We used to support using pause I/O for certain machines.  We
-diff -Nur linux-2.4.32-rc1/drivers/char/victor_mpc30x_keymap.map linux-2.4.32-rc1.mips/drivers/char/victor_mpc30x_keymap.map
---- linux-2.4.32-rc1/drivers/char/victor_mpc30x_keymap.map     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/char/victor_mpc30x_keymap.map        2004-02-05 18:04:42.000000000 +0100
+Index: linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map
  @@ -0,0 +1,102 @@
  +# Victor Interlink MP-C303/304 keyboard keymap
  +#
@@ -14757,10 +14905,11 @@ diff -Nur linux-2.4.32-rc1/drivers/char/victor_mpc30x_keymap.map linux-2.4.32-rc
  +      alt keycode 31 = PageDown
  +keycode 47 = Right
  +      alt keycode 47 = End
-diff -Nur linux-2.4.32-rc1/drivers/char/vr41xx_keyb.c linux-2.4.32-rc1.mips/drivers/char/vr41xx_keyb.c
---- linux-2.4.32-rc1/drivers/char/vr41xx_keyb.c        2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/char/vr41xx_keyb.c   2004-02-17 13:08:55.000000000 +0100
-@@ -308,7 +308,7 @@
+Index: linux-2.4.35.4/drivers/char/vr41xx_keyb.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/vr41xx_keyb.c
++++ linux-2.4.35.4/drivers/char/vr41xx_keyb.c
+@@ -308,7 +308,7 @@ void __devinit kbd_init_hw(void)
                         if (found != 0) {
                                 kiu_base = VRC4173_KIU_OFFSET;
                                 mkiuintreg = VRC4173_MKIUINTREG_OFFSET;
@@ -14769,7 +14918,7 @@ diff -Nur linux-2.4.32-rc1/drivers/char/vr41xx_keyb.c linux-2.4.32-rc1.mips/driv
                         }
                 }
   #endif
-@@ -325,7 +325,7 @@
+@@ -325,7 +325,7 @@ void __devinit kbd_init_hw(void)
   
         if (current_cpu_data.cputype == CPU_VR4111 ||
             current_cpu_data.cputype == CPU_VR4121)
@@ -14778,10 +14927,11 @@ diff -Nur linux-2.4.32-rc1/drivers/char/vr41xx_keyb.c linux-2.4.32-rc1.mips/driv
   
         kiu_writew(KIURST_KIURST, KIURST);
   
-diff -Nur linux-2.4.32-rc1/drivers/i2c/Config.in linux-2.4.32-rc1.mips/drivers/i2c/Config.in
---- linux-2.4.32-rc1/drivers/i2c/Config.in     2004-04-14 15:05:29.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/i2c/Config.in        2005-02-11 20:49:04.000000000 +0100
-@@ -57,6 +57,10 @@
+Index: linux-2.4.35.4/drivers/i2c/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/i2c/Config.in
++++ linux-2.4.35.4/drivers/i2c/Config.in
+@@ -57,6 +57,10 @@ if [ "$CONFIG_I2C" != "n" ]; then
      if [ "$CONFIG_SGI_IP22" = "y" ]; then
         dep_tristate 'I2C SGI interfaces' CONFIG_I2C_ALGO_SGI $CONFIG_I2C
      fi
@@ -14792,9 +14942,10 @@ diff -Nur linux-2.4.32-rc1/drivers/i2c/Config.in linux-2.4.32-rc1.mips/drivers/i
    
   # This is needed for automatic patch generation: sensors code starts here
   # This is needed for automatic patch generation: sensors code ends here
-diff -Nur linux-2.4.32-rc1/drivers/i2c/i2c-algo-au1550.c linux-2.4.32-rc1.mips/drivers/i2c/i2c-algo-au1550.c
---- linux-2.4.32-rc1/drivers/i2c/i2c-algo-au1550.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/i2c/i2c-algo-au1550.c        2005-02-11 20:49:04.000000000 +0100
+Index: linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c
  @@ -0,0 +1,340 @@
  +/*
  + * i2c-algo-au1550.c: SMBus (i2c) driver algorithms for Alchemy PSC interface
@@ -15136,9 +15287,10 @@ diff -Nur linux-2.4.32-rc1/drivers/i2c/i2c-algo-au1550.c linux-2.4.32-rc1.mips/d
  +MODULE_AUTHOR("Dan Malek <dan@embeddededge.com>");
  +MODULE_DESCRIPTION("SMBus Au1550 algorithm");
  +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/i2c/i2c-au1550.c linux-2.4.32-rc1.mips/drivers/i2c/i2c-au1550.c
---- linux-2.4.32-rc1/drivers/i2c/i2c-au1550.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/i2c/i2c-au1550.c     2005-02-11 20:49:04.000000000 +0100
+Index: linux-2.4.35.4/drivers/i2c/i2c-au1550.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/i2c/i2c-au1550.c
  @@ -0,0 +1,154 @@
  +/*
  + * i2c-au1550.c: SMBus (i2c) adapter for Alchemy PSC interface
@@ -15294,10 +15446,11 @@ diff -Nur linux-2.4.32-rc1/drivers/i2c/i2c-au1550.c linux-2.4.32-rc1.mips/driver
  +{
  +      i2c_au1550_del_bus(&pb1550_board_adapter);
  +}
-diff -Nur linux-2.4.32-rc1/drivers/i2c/i2c-core.c linux-2.4.32-rc1.mips/drivers/i2c/i2c-core.c
---- linux-2.4.32-rc1/drivers/i2c/i2c-core.c    2005-06-01 02:56:56.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/i2c/i2c-core.c       2005-05-23 14:12:30.000000000 +0200
-@@ -1280,6 +1280,9 @@
+Index: linux-2.4.35.4/drivers/i2c/i2c-core.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/i2c/i2c-core.c
++++ linux-2.4.35.4/drivers/i2c/i2c-core.c
+@@ -1277,6 +1277,9 @@ static int __init i2c_init(void)
   #ifdef CONFIG_I2C_MAX1617
         extern int i2c_max1617_init(void);
   #endif
@@ -15307,7 +15460,7 @@ diff -Nur linux-2.4.32-rc1/drivers/i2c/i2c-core.c linux-2.4.32-rc1.mips/drivers/
   
   #ifdef CONFIG_I2C_PROC
         extern int sensors_init(void);
-@@ -1335,6 +1338,10 @@
+@@ -1332,6 +1335,10 @@ int __init i2c_init_all(void)
         i2c_max1617_init();
   #endif
   
@@ -15318,10 +15471,11 @@ diff -Nur linux-2.4.32-rc1/drivers/i2c/i2c-core.c linux-2.4.32-rc1.mips/drivers/
         /* -------------- proc interface ---- */
   #ifdef CONFIG_I2C_PROC
         sensors_init();
-diff -Nur linux-2.4.32-rc1/drivers/i2c/Makefile linux-2.4.32-rc1.mips/drivers/i2c/Makefile
---- linux-2.4.32-rc1/drivers/i2c/Makefile      2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/i2c/Makefile 2005-02-11 20:49:04.000000000 +0100
-@@ -6,7 +6,7 @@
+Index: linux-2.4.35.4/drivers/i2c/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/i2c/Makefile
++++ linux-2.4.35.4/drivers/i2c/Makefile
+@@ -6,7 +6,7 @@ O_TARGET := i2c.o
   
   export-objs   := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \
                    i2c-algo-ite.o i2c-algo-sibyte.o i2c-algo-sgi.o \
@@ -15330,7 +15484,7 @@ diff -Nur linux-2.4.32-rc1/drivers/i2c/Makefile linux-2.4.32-rc1.mips/drivers/i2
   
   obj-$(CONFIG_I2C)             += i2c-core.o
   obj-$(CONFIG_I2C_CHARDEV)     += i2c-dev.o
-@@ -25,6 +25,7 @@
+@@ -25,6 +25,7 @@ obj-$(CONFIG_I2C_KEYWEST)    += i2c-keywest
   obj-$(CONFIG_I2C_ALGO_SIBYTE) += i2c-algo-sibyte.o i2c-sibyte.o
   obj-$(CONFIG_I2C_MAX1617)     += i2c-max1617.o
   obj-$(CONFIG_I2C_ALGO_SGI)    += i2c-algo-sgi.o
@@ -15338,10 +15492,11 @@ diff -Nur linux-2.4.32-rc1/drivers/i2c/Makefile linux-2.4.32-rc1.mips/drivers/i2
   
   # This is needed for automatic patch generation: sensors code starts here
   # This is needed for automatic patch generation: sensors code ends here
-diff -Nur linux-2.4.32-rc1/drivers/media/video/indycam.c linux-2.4.32-rc1.mips/drivers/media/video/indycam.c
---- linux-2.4.32-rc1/drivers/media/video/indycam.c     2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/media/video/indycam.c        2004-12-09 21:32:05.000000000 +0100
-@@ -50,13 +50,14 @@
+Index: linux-2.4.35.4/drivers/media/video/indycam.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/media/video/indycam.c
++++ linux-2.4.35.4/drivers/media/video/indycam.c
+@@ -50,13 +50,14 @@ static int indycam_attach(struct i2c_ada
                 0x80,                   /* INDYCAM_GAMMA */
         };
   
@@ -15358,7 +15513,7 @@ diff -Nur linux-2.4.32-rc1/drivers/media/video/indycam.c linux-2.4.32-rc1.mips/d
         camera = kmalloc(sizeof(*camera), GFP_KERNEL);
         if (!camera) {
                 err = -ENOMEM;
-@@ -67,7 +68,7 @@
+@@ -67,7 +68,7 @@ static int indycam_attach(struct i2c_ada
         client->adapter = adap;
         client->addr = addr;
         client->driver = &i2c_driver_indycam;
@@ -15367,7 +15522,7 @@ diff -Nur linux-2.4.32-rc1/drivers/media/video/indycam.c linux-2.4.32-rc1.mips/d
         camera->client = client;
   
         err = i2c_attach_client(client);
-@@ -75,18 +76,18 @@
+@@ -75,18 +76,18 @@ static int indycam_attach(struct i2c_ada
                 goto out_free_camera;
   
         camera->version = i2c_smbus_read_byte_data(client, INDYCAM_VERSION);
@@ -15390,9 +15545,10 @@ diff -Nur linux-2.4.32-rc1/drivers/media/video/indycam.c linux-2.4.32-rc1.mips/d
   
         MOD_INC_USE_COUNT;
         return 0;
-diff -Nur linux-2.4.32-rc1/drivers/media/video/vino.c linux-2.4.32-rc1.mips/drivers/media/video/vino.c
---- linux-2.4.32-rc1/drivers/media/video/vino.c        2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/media/video/vino.c   2004-12-10 05:02:54.000000000 +0100
+Index: linux-2.4.35.4/drivers/media/video/vino.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/media/video/vino.c
++++ linux-2.4.35.4/drivers/media/video/vino.c
  @@ -5,6 +5,8 @@
    * License version 2 as published by the Free Software Foundation.
    *
@@ -15427,7 +15583,7 @@ diff -Nur linux-2.4.32-rc1/drivers/media/video/vino.c linux-2.4.32-rc1.mips/driv
   #define VINO_MIN_WIDTH                32
   #define VINO_MIN_HEIGHT               32
   
-@@ -64,9 +76,7 @@
+@@ -64,9 +76,7 @@ static int threshold_b = 512;
   
   struct vino_device {
         struct video_device vdev;
@@ -15438,7 +15594,7 @@ diff -Nur linux-2.4.32-rc1/drivers/media/video/vino.c linux-2.4.32-rc1.mips/driv
         int alpha;
         /* clipping... */
         unsigned int left, right, top, bottom;
-@@ -106,7 +116,7 @@
+@@ -106,7 +116,7 @@ struct vino_device {
   
   struct vino_client {
         struct i2c_client *driver;
@@ -15447,7 +15603,7 @@ diff -Nur linux-2.4.32-rc1/drivers/media/video/vino.c linux-2.4.32-rc1.mips/driv
   };
   
   struct vino_video {
-@@ -362,6 +372,7 @@
+@@ -362,6 +372,7 @@ static int set_scaling(struct vino_devic
   static int dma_setup(struct vino_device *v)
   {
         u32 ctrl, intr;
@@ -15455,7 +15611,7 @@ diff -Nur linux-2.4.32-rc1/drivers/media/video/vino.c linux-2.4.32-rc1.mips/driv
         struct sgi_vino_channel *ch;
   
         ch = (v->chan == VINO_CHAN_A) ? &vino->a : &vino->b;
-@@ -377,14 +388,24 @@
+@@ -377,14 +388,24 @@ static int dma_setup(struct vino_device 
         ch->line_size = v->line_size - 8;
         /* set the alpha register */
         ch->alpha = v->alpha;
@@ -15486,7 +15642,7 @@ diff -Nur linux-2.4.32-rc1/drivers/media/video/vino.c linux-2.4.32-rc1.mips/driv
         /* init the frame rate and norm (full frame rate only for now...) */
         ch->frame_rate = VINO_FRAMERT_RT(0x1fff) |
                          (get_capture_norm(v) == VIDEO_MODE_PAL ?
-@@ -510,6 +531,7 @@
+@@ -510,6 +531,7 @@ static void field_done(struct vino_devic
   static void vino_interrupt(int irq, void *dev_id, struct pt_regs *regs)
   {
         u32 intr, ctrl;
@@ -15494,7 +15650,7 @@ diff -Nur linux-2.4.32-rc1/drivers/media/video/vino.c linux-2.4.32-rc1.mips/driv
   
         spin_lock(&Vino->vino_lock);
         ctrl = vino->control;
-@@ -525,12 +547,14 @@
+@@ -525,12 +547,14 @@ static void vino_interrupt(int irq, void
                 vino->control = ctrl;
                 clear_eod(&Vino->chB);
         }
@@ -15513,10 +15669,11 @@ diff -Nur linux-2.4.32-rc1/drivers/media/video/vino.c linux-2.4.32-rc1.mips/driv
   }
   
   static int vino_grab(struct vino_device *v, int frame)
-diff -Nur linux-2.4.32-rc1/drivers/mtd/devices/docprobe.c linux-2.4.32-rc1.mips/drivers/mtd/devices/docprobe.c
---- linux-2.4.32-rc1/drivers/mtd/devices/docprobe.c    2003-06-13 16:51:34.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/mtd/devices/docprobe.c       2003-06-16 01:42:21.000000000 +0200
-@@ -89,10 +89,10 @@
+Index: linux-2.4.35.4/drivers/mtd/devices/docprobe.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/devices/docprobe.c
++++ linux-2.4.35.4/drivers/mtd/devices/docprobe.c
+@@ -89,10 +89,10 @@ static unsigned long __initdata doc_loca
         0xe4000000,
   #elif defined(CONFIG_MOMENCO_OCELOT)
         0x2f000000,
@@ -15530,9 +15687,10 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/devices/docprobe.c linux-2.4.32-rc1.mips/
   #warning Unknown architecture for DiskOnChip. No default probe locations defined
   #endif
         0 };
-diff -Nur linux-2.4.32-rc1/drivers/mtd/devices/ms02-nv.c linux-2.4.32-rc1.mips/drivers/mtd/devices/ms02-nv.c
---- linux-2.4.32-rc1/drivers/mtd/devices/ms02-nv.c     2003-06-13 16:51:34.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/mtd/devices/ms02-nv.c        2004-07-30 12:22:40.000000000 +0200
+Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/devices/ms02-nv.c
++++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c
  @@ -1,10 +1,10 @@
   /*
  - *      Copyright (c) 2001 Maciej W. Rozycki
@@ -15573,7 +15731,7 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/devices/ms02-nv.c linux-2.4.32-rc1.mips/d
    */
   static ulong ms02nv_addrs[] __initdata = {
         0x07000000, 0x06800000, 0x06000000, 0x05800000, 0x05000000,
-@@ -130,7 +130,7 @@
+@@ -130,7 +130,7 @@ static int __init ms02nv_init_one(ulong 
   
         int ret = -ENODEV;
   
@@ -15582,7 +15740,7 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/devices/ms02-nv.c linux-2.4.32-rc1.mips/d
         mod_res = kmalloc(sizeof(*mod_res), GFP_KERNEL);
         if (!mod_res)
                 return -ENOMEM;
-@@ -233,7 +233,7 @@
+@@ -233,7 +233,7 @@ static int __init ms02nv_init_one(ulong 
                 goto err_out_csr_res;
         }
   
@@ -15591,7 +15749,7 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/devices/ms02-nv.c linux-2.4.32-rc1.mips/d
                 mtd->index, ms02nv_name, addr, size >> 20);
   
         mp->next = root_ms02nv_mtd;
-@@ -293,12 +293,12 @@
+@@ -293,12 +293,12 @@ static int __init ms02nv_init(void)
   
         switch (mips_machtype) {
         case MACH_DS5000_200:
@@ -15606,9 +15764,10 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/devices/ms02-nv.c linux-2.4.32-rc1.mips/d
                 csr = (volatile u32 *)KN03_MCR_BASE;
                 if (*csr & KN03_MCR_BNK32M)
                         stride = 2;
-diff -Nur linux-2.4.32-rc1/drivers/mtd/devices/ms02-nv.h linux-2.4.32-rc1.mips/drivers/mtd/devices/ms02-nv.h
---- linux-2.4.32-rc1/drivers/mtd/devices/ms02-nv.h     2002-11-29 00:53:13.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/mtd/devices/ms02-nv.h        2004-07-30 12:22:40.000000000 +0200
+Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/devices/ms02-nv.h
++++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h
  @@ -1,32 +1,96 @@
   /*
  - *      Copyright (c) 2001 Maciej W. Rozycki
@@ -15715,10 +15874,11 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/devices/ms02-nv.h linux-2.4.32-rc1.mips/d
   typedef volatile u32 ms02nv_uint;
   
   struct ms02nv_private {
-diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/Config.in linux-2.4.32-rc1.mips/drivers/mtd/maps/Config.in
---- linux-2.4.32-rc1/drivers/mtd/maps/Config.in        2003-06-13 16:51:34.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/mtd/maps/Config.in   2004-02-26 01:46:35.000000000 +0100
-@@ -51,11 +51,26 @@
+Index: linux-2.4.35.4/drivers/mtd/maps/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/maps/Config.in
++++ linux-2.4.35.4/drivers/mtd/maps/Config.in
+@@ -51,11 +51,26 @@ if [ "$CONFIG_MIPS" = "y" ]; then
      dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
      dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
      dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
@@ -15745,9 +15905,10 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/Config.in linux-2.4.32-rc1.mips/driv
      dep_tristate '  Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS 
      if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then
         hex '    Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000
-diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/db1x00-flash.c linux-2.4.32-rc1.mips/drivers/mtd/maps/db1x00-flash.c
---- linux-2.4.32-rc1/drivers/mtd/maps/db1x00-flash.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/mtd/maps/db1x00-flash.c      2005-02-03 07:35:29.000000000 +0100
+Index: linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c
  @@ -0,0 +1,283 @@
  +/*
  + * Flash memory access on Alchemy Db1xxx boards
@@ -16032,9 +16193,10 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/db1x00-flash.c linux-2.4.32-rc1.mips
  +MODULE_AUTHOR("Pete Popov");
  +MODULE_DESCRIPTION("Db1x00 mtd map driver");
  +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/hydrogen3-flash.c linux-2.4.32-rc1.mips/drivers/mtd/maps/hydrogen3-flash.c
---- linux-2.4.32-rc1/drivers/mtd/maps/hydrogen3-flash.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/mtd/maps/hydrogen3-flash.c   2004-01-10 23:40:18.000000000 +0100
+Index: linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c
  @@ -0,0 +1,189 @@
  +/*
  + * Flash memory access on Alchemy HydrogenIII boards
@@ -16225,9 +16387,10 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/hydrogen3-flash.c linux-2.4.32-rc1.m
  +MODULE_AUTHOR("Pete Popov");
  +MODULE_DESCRIPTION("HydrogenIII mtd map driver");
  +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/lasat.c linux-2.4.32-rc1.mips/drivers/mtd/maps/lasat.c
---- linux-2.4.32-rc1/drivers/mtd/maps/lasat.c  2003-06-13 16:51:34.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/mtd/maps/lasat.c     2003-08-18 04:59:02.000000000 +0200
+Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/maps/lasat.c
++++ linux-2.4.35.4/drivers/mtd/maps/lasat.c
  @@ -1,15 +1,6 @@
   /*
    * Flash device on lasat 100 and 200 boards
@@ -16252,7 +16415,7 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/lasat.c linux-2.4.32-rc1.mips/driver
   
   static struct mtd_info *mymtd;
   
-@@ -69,30 +59,33 @@
+@@ -69,30 +59,33 @@ static void sp_copy_to(struct map_info *
   }
   
   static struct map_info sp_map = {
@@ -16298,7 +16461,7 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/lasat.c linux-2.4.32-rc1.mips/driver
         sp_map.size = lasat_board_info.li_flash_size;
   
                 printk(KERN_NOTICE "sp flash device: %lx at %lx\n", 
-@@ -109,12 +102,15 @@
+@@ -109,12 +102,15 @@ static int __init init_sp(void)
   
                 for (i=0; i < LASAT_MTD_LAST; i++) {
                         size = lasat_flash_partition_size(i);
@@ -16318,7 +16481,7 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/lasat.c linux-2.4.32-rc1.mips/driver
                 return 0;
         }
   
-@@ -124,11 +120,11 @@
+@@ -124,11 +120,11 @@ static int __init init_sp(void)
   static void __exit cleanup_sp(void)
   {
         if (mymtd) {
@@ -16333,10 +16496,11 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/lasat.c linux-2.4.32-rc1.mips/driver
         }
   }
   
-diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/Makefile linux-2.4.32-rc1.mips/drivers/mtd/maps/Makefile
---- linux-2.4.32-rc1/drivers/mtd/maps/Makefile 2003-06-13 16:51:34.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/mtd/maps/Makefile    2004-02-26 01:46:35.000000000 +0100
-@@ -52,7 +52,13 @@
+Index: linux-2.4.35.4/drivers/mtd/maps/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/maps/Makefile
++++ linux-2.4.35.4/drivers/mtd/maps/Makefile
+@@ -52,7 +52,13 @@ obj-$(CONFIG_MTD_PCI)               += pci.o
   obj-$(CONFIG_MTD_PB1000)      += pb1xxx-flash.o
   obj-$(CONFIG_MTD_PB1100)      += pb1xxx-flash.o
   obj-$(CONFIG_MTD_PB1500)      += pb1xxx-flash.o
@@ -16350,16 +16514,17 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/Makefile linux-2.4.32-rc1.mips/drive
   obj-$(CONFIG_MTD_AUTCPU12)    += autcpu12-nvram.o
   obj-$(CONFIG_MTD_EDB7312)     += edb7312.o
   obj-$(CONFIG_MTD_IMPA7)               += impa7.o
-@@ -61,5 +67,6 @@
+@@ -61,5 +67,6 @@ obj-$(CONFIG_MTD_REDWOOD)    += redwood.o
   obj-$(CONFIG_MTD_UCLINUX)     += uclinux.o
   obj-$(CONFIG_MTD_NETtel)      += nettel.o
   obj-$(CONFIG_MTD_SCB2_FLASH)  += scb2_flash.o
  +obj-$(CONFIG_MTD_MIRAGE)        += mirage-flash.o
   
   include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/mirage-flash.c linux-2.4.32-rc1.mips/drivers/mtd/maps/mirage-flash.c
---- linux-2.4.32-rc1/drivers/mtd/maps/mirage-flash.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/mtd/maps/mirage-flash.c      2003-12-22 04:37:22.000000000 +0100
+Index: linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c
  @@ -0,0 +1,194 @@
  +/*
  + * Flash memory access on AMD Mirage board.
@@ -16555,9 +16720,10 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/mirage-flash.c linux-2.4.32-rc1.mips
  +MODULE_AUTHOR("Embedded Edge");
  +MODULE_DESCRIPTION("Mirage mtd map driver");
  +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/mtx-1.c linux-2.4.32-rc1.mips/drivers/mtd/maps/mtx-1.c
---- linux-2.4.32-rc1/drivers/mtd/maps/mtx-1.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/mtd/maps/mtx-1.c     2003-06-27 02:04:35.000000000 +0200
+Index: linux-2.4.35.4/drivers/mtd/maps/mtx-1.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/mtd/maps/mtx-1.c
  @@ -0,0 +1,181 @@
  +/*
  + * Flash memory access on 4G Systems MTX-1 board
@@ -16740,9 +16906,10 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/mtx-1.c linux-2.4.32-rc1.mips/driver
  +MODULE_AUTHOR("Pete Popov");
  +MODULE_DESCRIPTION("MTX-1 CFI map driver");
  +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/pb1550-flash.c linux-2.4.32-rc1.mips/drivers/mtd/maps/pb1550-flash.c
---- linux-2.4.32-rc1/drivers/mtd/maps/pb1550-flash.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/mtd/maps/pb1550-flash.c      2004-02-26 01:48:48.000000000 +0100
+Index: linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c
  @@ -0,0 +1,270 @@
  +/*
  + * Flash memory access on Alchemy Pb1550 board
@@ -17014,10 +17181,11 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/pb1550-flash.c linux-2.4.32-rc1.mips
  +MODULE_AUTHOR("Embedded Edge, LLC");
  +MODULE_DESCRIPTION("Pb1550 mtd map driver");
  +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/pb1xxx-flash.c linux-2.4.32-rc1.mips/drivers/mtd/maps/pb1xxx-flash.c
---- linux-2.4.32-rc1/drivers/mtd/maps/pb1xxx-flash.c   2003-06-13 16:51:34.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/mtd/maps/pb1xxx-flash.c      2003-05-19 08:27:22.000000000 +0200
-@@ -192,6 +192,34 @@
+Index: linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/maps/pb1xxx-flash.c
++++ linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c
+@@ -192,6 +192,34 @@ static struct mtd_partition pb1xxx_parti
   #else
   #error MTD_PB1500 define combo error /* should never happen */
   #endif
@@ -17052,9 +17220,10 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/pb1xxx-flash.c linux-2.4.32-rc1.mips
   #else
   #error Unsupported board
   #endif
-diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/xxs1500.c linux-2.4.32-rc1.mips/drivers/mtd/maps/xxs1500.c
---- linux-2.4.32-rc1/drivers/mtd/maps/xxs1500.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/mtd/maps/xxs1500.c   2003-08-02 04:06:01.000000000 +0200
+Index: linux-2.4.35.4/drivers/mtd/maps/xxs1500.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/mtd/maps/xxs1500.c
  @@ -0,0 +1,186 @@
  +/*
  + * Flash memory access on MyCable XXS1500 board
@@ -17242,9 +17411,10 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/xxs1500.c linux-2.4.32-rc1.mips/driv
  +MODULE_AUTHOR("Pete Popov");
  +MODULE_DESCRIPTION("XXS1500 CFI map driver");
  +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net/defxx.c
---- linux-2.4.32-rc1/drivers/net/defxx.c       2004-11-17 12:54:21.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/net/defxx.c  2004-11-19 01:28:39.000000000 +0100
+Index: linux-2.4.35.4/drivers/net/defxx.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/defxx.c
++++ linux-2.4.35.4/drivers/net/defxx.c
  @@ -10,24 +10,18 @@
    *
    * Abstract:
@@ -17337,7 +17507,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   
   #define DYNAMIC_BUFFERS 1
   
-@@ -243,7 +251,7 @@
+@@ -243,7 +251,7 @@ static char version[] __devinitdata =
   static void           dfx_bus_init(struct net_device *dev);
   static void           dfx_bus_config_check(DFX_board_t *bp);
   
@@ -17346,7 +17516,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   static int            dfx_adap_init(DFX_board_t *bp, int get_buffers);
   
   static int            dfx_open(struct net_device *dev);
-@@ -337,48 +345,84 @@
+@@ -337,48 +345,84 @@ static inline void dfx_port_write_byte(
         int                     offset,
         u8                      data
         )
@@ -17431,7 +17601,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   
   \f
   /*
-@@ -393,8 +437,9 @@
+@@ -393,8 +437,9 @@ static inline void dfx_port_read_long(
    *   Condition code
    *       
    * Arguments:
@@ -17443,7 +17613,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
    *
    * Functional Description:
    *
-@@ -410,54 +455,68 @@
+@@ -410,54 +455,68 @@ static inline void dfx_port_read_long(
    *   initialized and the board resources are read and stored in
    *   the device structure.
    */
@@ -17531,7 +17701,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
         dev->get_stats                  = dfx_ctl_get_stats;
         dev->open                       = dfx_open;
         dev->stop                       = dfx_close;
-@@ -465,37 +524,54 @@
+@@ -465,37 +524,54 @@ static int __devinit dfx_init_one_pci_or
         dev->set_multicast_list         = dfx_ctl_set_multicast_list;
         dev->set_mac_address            = dfx_ctl_set_mac_address;
   
@@ -17595,7 +17765,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   }
   
   static int __init dfx_eisa_init(void)
-@@ -507,6 +583,7 @@
+@@ -507,6 +583,7 @@ static int __init dfx_eisa_init(void)
   
         DBG_printk("In dfx_eisa_init...\n");
   
@@ -17603,7 +17773,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
         /* Scan for FDDI EISA controllers */
   
         for (i=0; i < DFX_MAX_EISA_SLOTS; i++)          /* only scan for up to 16 EISA slots */
-@@ -517,9 +594,27 @@
+@@ -517,9 +594,27 @@ static int __init dfx_eisa_init(void)
                 {
                         port = (i << 12);                                       /* recalc base addr */
   
@@ -17632,7 +17802,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
         return rc;
   }
   \f
-@@ -583,8 +678,9 @@
+@@ -583,8 +678,9 @@ static void __devinit dfx_bus_init(struc
   
         /* Initialize adapter based on bus type */
   
@@ -17644,7 +17814,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
                 /* Get the interrupt level from the ESIC chip */
   
                 dfx_port_read_byte(bp, PI_ESIC_K_IO_CONFIG_STAT_0, &val);
-@@ -766,6 +862,7 @@
+@@ -766,6 +862,7 @@ static void __devinit dfx_bus_config_che
    *       
    * Arguments:
    *   dev - pointer to device information
@@ -17652,7 +17822,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
    *
    * Functional Description:
    *   This function allocates additional resources such as the host memory
-@@ -780,20 +877,21 @@
+@@ -780,20 +877,21 @@ static void __devinit dfx_bus_config_che
    *                                            or read adapter MAC address
    *
    * Assumptions:
@@ -17678,7 +17848,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
         u32                     data;                           /* host data register value */
   
         DBG_printk("In dfx_driver_init...\n");
-@@ -837,26 +935,20 @@
+@@ -837,26 +935,20 @@ static int __devinit dfx_driver_init(str
   
         /*  Read the factory MAC address from the adapter then save it */
   
@@ -17715,7 +17885,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
         memcpy(&bp->factory_mac_addr[4], &data, sizeof(u16));
   
         /*
-@@ -867,28 +959,27 @@
+@@ -867,28 +959,27 @@ static int __devinit dfx_driver_init(str
          */
   
         memcpy(dev->dev_addr, bp->factory_mac_addr, FDDI_K_ALEN);
@@ -17764,7 +17934,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   
         /*
          * Get memory for descriptor block, consumer block, and other buffers
-@@ -903,14 +994,15 @@
+@@ -903,14 +994,15 @@ static int __devinit dfx_driver_init(str
   #endif
                                         sizeof(PI_CONSUMER_BLOCK) +
                                         (PI_ALIGN_K_DESC_BLK - 1);
@@ -17786,7 +17956,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   
         /*
          *  To guarantee the 8K alignment required for the descriptor block, 8K - 1
-@@ -924,7 +1016,7 @@
+@@ -924,7 +1016,7 @@ static int __devinit dfx_driver_init(str
          *                for allocating the needed memory.
          */
   
@@ -17795,7 +17965,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
         curr_v = top_v + (curr_p - top_p);
   
         /* Reserve space for descriptor block */
-@@ -965,14 +1057,20 @@
+@@ -965,14 +1057,20 @@ static int __devinit dfx_driver_init(str
   
         /* Display virtual and physical addresses if debug driver */
   
@@ -17822,7 +17992,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   
   \f
   /*
-@@ -1218,7 +1316,9 @@
+@@ -1218,7 +1316,9 @@ static int dfx_open(struct net_device *d
         
         /* Register IRQ - support shared interrupts by passing device ptr */
   
@@ -17833,7 +18003,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
         if (ret) {
                 printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq);
                 return ret;
-@@ -1737,7 +1837,7 @@
+@@ -1737,7 +1837,7 @@ static void dfx_interrupt(int irq, void 
                 dfx_port_write_long(bp, PFI_K_REG_MODE_CTRL,
                                         (PFI_MODE_M_PDQ_INT_ENB + PFI_MODE_M_DMA_ENB));
                 }
@@ -17842,7 +18012,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
                 {
                 /* Disable interrupts at the ESIC */
   
-@@ -1755,6 +1855,13 @@
+@@ -1755,6 +1855,13 @@ static void dfx_interrupt(int irq, void 
                 tmp |= PI_CONFIG_STAT_0_M_INT_ENB;
                 dfx_port_write_byte(bp, PI_ESIC_K_IO_CONFIG_STAT_0, tmp);
                 }
@@ -17856,7 +18026,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   
         spin_unlock(&bp->lock);
         }
-@@ -2663,12 +2770,12 @@
+@@ -2663,12 +2770,12 @@ static int dfx_hw_dma_uninit(DFX_board_t
    
   static void my_skb_align(struct sk_buff *skb, int n)
   {
@@ -17873,7 +18043,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   }
   
   \f
-@@ -2745,7 +2852,10 @@
+@@ -2745,7 +2852,10 @@ static int dfx_rcv_init(DFX_board_t *bp,
                          */
                          
                         my_skb_align(newskb, 128);
@@ -17885,7 +18055,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
                         /*
                          * p_rcv_buff_va is only used inside the
                          * kernel so we put the skb pointer here.
-@@ -2859,9 +2969,17 @@
+@@ -2859,9 +2969,17 @@ static void dfx_rcv_queue_process(
                                                 
                                                 my_skb_align(newskb, 128);
                                                 skb = (struct sk_buff *)bp->p_rcv_buff_va[entry];
@@ -17904,7 +18074,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
                                         } else
                                                 skb = NULL;
                                 } else
-@@ -2934,7 +3052,7 @@
+@@ -2934,7 +3052,7 @@ static void dfx_rcv_queue_process(
    *   is contained in a single physically contiguous buffer
    *   in which the virtual address of the start of packet
    *   (skb->data) can be converted to a physical address
@@ -17913,7 +18083,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
    *
    *   Since the adapter architecture requires a three byte
    *   packet request header to prepend the start of packet,
-@@ -3082,12 +3200,13 @@
+@@ -3082,12 +3200,13 @@ static int dfx_xmt_queue_pkt(
          *                      skb->data.
          *               6. The physical address of the start of packet
          *                      can be determined from the virtual address
@@ -17929,7 +18099,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   
         /*
          * Verify that descriptor is actually available
-@@ -3171,6 +3290,7 @@
+@@ -3171,6 +3290,7 @@ static int dfx_xmt_done(DFX_board_t *bp)
         {
         XMT_DRIVER_DESCR        *p_xmt_drv_descr;       /* ptr to transmit driver descriptor */
         PI_TYPE_2_CONSUMER      *p_type_2_cons;         /* ptr to rcv/xmt consumer block register */
@@ -17937,7 +18107,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
         int                     freed = 0;              /* buffers freed */
   
         /* Service all consumed transmit frames */
-@@ -3188,7 +3308,11 @@
+@@ -3188,7 +3308,11 @@ static int dfx_xmt_done(DFX_board_t *bp)
                 bp->xmt_total_bytes += p_xmt_drv_descr->p_skb->len;
   
                 /* Return skb to operating system */
@@ -17950,7 +18120,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
                 dev_kfree_skb_irq(p_xmt_drv_descr->p_skb);
   
                 /*
-@@ -3297,6 +3421,7 @@
+@@ -3297,6 +3421,7 @@ static void dfx_xmt_flush( DFX_board_t *
         {
         u32                     prod_cons;              /* rcv/xmt consumer block longword */
         XMT_DRIVER_DESCR        *p_xmt_drv_descr;       /* ptr to transmit driver descriptor */
@@ -17958,7 +18128,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   
         /* Flush all outstanding transmit frames */
   
-@@ -3307,7 +3432,11 @@
+@@ -3307,7 +3432,11 @@ static void dfx_xmt_flush( DFX_board_t *
                 p_xmt_drv_descr = &(bp->xmt_drv_descr_blk[bp->rcv_xmt_reg.index.xmt_comp]);
   
                 /* Return skb to operating system */
@@ -17971,7 +18141,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
                 dev_kfree_skb(p_xmt_drv_descr->p_skb);
   
                 /* Increment transmit error counter */
-@@ -3337,12 +3466,36 @@
+@@ -3337,12 +3466,36 @@ static void dfx_xmt_flush( DFX_board_t *
   
   static void __devexit dfx_remove_one_pci_or_eisa(struct pci_dev *pdev, struct net_device *dev)
   {
@@ -18012,7 +18182,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   }
   
   static void __devexit dfx_remove_one (struct pci_dev *pdev)
-@@ -3353,21 +3506,22 @@
+@@ -3353,21 +3506,22 @@ static void __devexit dfx_remove_one (st
         pci_set_drvdata(pdev, NULL);
   }
   
@@ -18040,7 +18210,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   
   
   static void __exit dfx_eisa_cleanup(void)
-@@ -3388,12 +3542,7 @@
+@@ -3388,12 +3542,7 @@ static void __exit dfx_eisa_cleanup(void
   
   static int __init dfx_init(void)
   {
@@ -18054,7 +18224,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   
         rc_pci = pci_module_init(&dfx_driver);
         if (rc_pci >= 0) dfx_have_pci = 1;
-@@ -3401,20 +3550,27 @@
+@@ -3401,20 +3550,27 @@ static int __init dfx_init(void)
         rc_eisa = dfx_eisa_init();
         if (rc_eisa >= 0) dfx_have_eisa = 1;
   
@@ -18085,9 +18255,10 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.c linux-2.4.32-rc1.mips/drivers/net
   MODULE_LICENSE("GPL");
   
   \f
-diff -Nur linux-2.4.32-rc1/drivers/net/defxx.h linux-2.4.32-rc1.mips/drivers/net/defxx.h
---- linux-2.4.32-rc1/drivers/net/defxx.h       2001-02-13 22:15:05.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/net/defxx.h  2004-10-03 20:06:48.000000000 +0200
+Index: linux-2.4.35.4/drivers/net/defxx.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/defxx.h
++++ linux-2.4.35.4/drivers/net/defxx.h
  @@ -12,17 +12,11 @@
    *   Contains all definitions specified by port specification and required
    *   by the defxx.c driver.
@@ -18118,7 +18289,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.h linux-2.4.32-rc1.mips/drivers/net
    */
   
   #ifndef _DEFXX_H_
-@@ -1467,6 +1462,11 @@
+@@ -1467,6 +1462,11 @@ typedef union
   
   #endif        /* #ifndef BIG_ENDIAN */
   
@@ -18130,7 +18301,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.h linux-2.4.32-rc1.mips/drivers/net
   /* Define EISA controller register offsets */
   
   #define PI_ESIC_K_BURST_HOLDOFF               0x040
-@@ -1634,6 +1634,7 @@
+@@ -1634,6 +1634,7 @@ typedef union
   
   #define DFX_BUS_TYPE_PCI              0                       /* type code for DEC FDDIcontroller/PCI */
   #define DFX_BUS_TYPE_EISA             1                       /* type code for DEC FDDIcontroller/EISA */
@@ -18138,7 +18309,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.h linux-2.4.32-rc1.mips/drivers/net
   
   #define DFX_FC_PRH2_PRH1_PRH0         0x54003820      /* Packet Request Header bytes + FC */
   #define DFX_PRH0_BYTE                 0x20            /* Packet Request Header byte 0 */
-@@ -1704,17 +1705,19 @@
+@@ -1704,17 +1705,19 @@ typedef struct DFX_board_tag
         {
         /* Keep virtual and physical pointers to locked, physically contiguous memory */
   
@@ -18164,7 +18335,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.h linux-2.4.32-rc1.mips/drivers/net
   
         /* Keep local copies of Type 1 and Type 2 register data */
   
-@@ -1758,8 +1761,9 @@
+@@ -1758,8 +1761,9 @@ typedef struct DFX_board_tag
   
         struct net_device               *dev;                                           /* pointer to device structure */
         struct net_device               *next;
@@ -18176,10 +18347,11 @@ diff -Nur linux-2.4.32-rc1/drivers/net/defxx.h linux-2.4.32-rc1.mips/drivers/net
         struct pci_dev *                pci_dev;
         u32                             full_duplex_enb;                                /* FDDI Full Duplex enable (1 == on, 2 == off) */
         u32                             req_ttrt;                                       /* requested TTRT value (in 80ns units) */
-diff -Nur linux-2.4.32-rc1/drivers/net/hamradio/hdlcdrv.c linux-2.4.32-rc1.mips/drivers/net/hamradio/hdlcdrv.c
---- linux-2.4.32-rc1/drivers/net/hamradio/hdlcdrv.c    2002-02-25 20:37:59.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/net/hamradio/hdlcdrv.c       2004-05-04 14:04:27.000000000 +0200
-@@ -587,6 +587,8 @@
+Index: linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/hamradio/hdlcdrv.c
++++ linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c
+@@ -587,6 +587,8 @@ static int hdlcdrv_close(struct net_devi
                 return -EINVAL;
         s = (struct hdlcdrv_state *)dev->priv;
   
@@ -18188,10 +18360,11 @@ diff -Nur linux-2.4.32-rc1/drivers/net/hamradio/hdlcdrv.c linux-2.4.32-rc1.mips/
         if (s->ops && s->ops->close)
                 i = s->ops->close(dev);
         if (s->skb)
-diff -Nur linux-2.4.32-rc1/drivers/net/irda/au1k_ir.c linux-2.4.32-rc1.mips/drivers/net/irda/au1k_ir.c
---- linux-2.4.32-rc1/drivers/net/irda/au1k_ir.c        2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/net/irda/au1k_ir.c   2005-02-03 07:35:29.000000000 +0100
-@@ -81,10 +81,6 @@
+Index: linux-2.4.35.4/drivers/net/irda/au1k_ir.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/irda/au1k_ir.c
++++ linux-2.4.35.4/drivers/net/irda/au1k_ir.c
+@@ -81,10 +81,6 @@ static char version[] __devinitdata =
   
   #define RUN_AT(x) (jiffies + (x))
   
@@ -18202,9 +18375,10 @@ diff -Nur linux-2.4.32-rc1/drivers/net/irda/au1k_ir.c linux-2.4.32-rc1.mips/driv
   static spinlock_t ir_lock = SPIN_LOCK_UNLOCKED;
   
   /*
-diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/net/sgiseeq.c
---- linux-2.4.32-rc1/drivers/net/sgiseeq.c     2005-01-19 15:09:56.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/net/sgiseeq.c        2005-09-23 16:35:27.000000000 +0200
+Index: linux-2.4.35.4/drivers/net/sgiseeq.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/sgiseeq.c
++++ linux-2.4.35.4/drivers/net/sgiseeq.c
  @@ -24,16 +24,16 @@
   #include <asm/io.h>
   #include <asm/system.h>
@@ -18224,7 +18398,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
   static char *sgiseeqstr = "SGI Seeq8003";
   
   /*
-@@ -113,9 +113,9 @@
+@@ -113,9 +113,9 @@ static struct net_device *root_sgiseeq_d
   
   static inline void hpc3_eth_reset(struct hpc3_ethregs *hregs)
   {
@@ -18236,7 +18410,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
   }
   
   static inline void reset_hpc3_and_seeq(struct hpc3_ethregs *hregs,
-@@ -238,7 +238,6 @@
+@@ -238,7 +238,6 @@ void sgiseeq_dump_rings(void)
   
   #define TSTAT_INIT_SEEQ (SEEQ_TCMD_IPT|SEEQ_TCMD_I16|SEEQ_TCMD_IC|SEEQ_TCMD_IUF)
   #define TSTAT_INIT_EDLC ((TSTAT_INIT_SEEQ) | SEEQ_TCMD_RB2)
@@ -18244,7 +18418,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
   
   static int init_seeq(struct net_device *dev, struct sgiseeq_private *sp,
                      struct sgiseeq_regs *sregs)
-@@ -260,8 +259,6 @@
+@@ -260,8 +259,6 @@ static int init_seeq(struct net_device *
                 sregs->tstat = TSTAT_INIT_SEEQ;
         }
   
@@ -18253,7 +18427,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
         hregs->rx_ndptr = PHYSADDR(&sp->srings.rx_desc[0]);
         hregs->tx_ndptr = PHYSADDR(&sp->srings.tx_desc[0]);
   
-@@ -432,7 +429,7 @@
+@@ -432,7 +429,7 @@ static void sgiseeq_interrupt(int irq, v
         spin_lock(&sp->tx_lock);
   
         /* Ack the IRQ and set software state. */
@@ -18262,7 +18436,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
   
         /* Always check for received packets. */
         sgiseeq_rx(dev, sp, hregs, sregs);
-@@ -616,7 +613,7 @@
+@@ -616,7 +613,7 @@ static inline void setup_rx_ring(struct 
   
   #define ALIGNED(x)  ((((unsigned long)(x)) + 0xf) & ~(0xf))
   
@@ -18271,7 +18445,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
   {
         struct net_device *dev;
         struct sgiseeq_private *sp;
-@@ -629,7 +626,7 @@
+@@ -629,7 +626,7 @@ int sgiseeq_init(struct hpc3_regs* regs,
                 goto err_out;
         }
         /* Make private data page aligned */
@@ -18280,7 +18454,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
         if (!sp) {
                 printk(KERN_ERR "Sgiseeq: Page alloc failed, aborting.\n");
                 err = -ENOMEM;
-@@ -644,7 +641,9 @@
+@@ -644,7 +641,9 @@ int sgiseeq_init(struct hpc3_regs* regs,
   
   #define EADDR_NVOFS     250
         for (i = 0; i < 3; i++) {
@@ -18291,7 +18465,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
   
                 dev->dev_addr[2 * i]     = tmp >> 8;
                 dev->dev_addr[2 * i + 1] = tmp & 0xff;
-@@ -654,8 +653,8 @@
+@@ -654,8 +653,8 @@ int sgiseeq_init(struct hpc3_regs* regs,
         gpriv = sp;
         gdev = dev;
   #endif
@@ -18302,7 +18476,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
         sp->name = sgiseeqstr;
         sp->mode = SEEQ_RCMD_RBCAST;
   
-@@ -672,6 +671,11 @@
+@@ -672,6 +671,11 @@ int sgiseeq_init(struct hpc3_regs* regs,
         setup_rx_ring(sp->srings.rx_desc, SEEQ_RX_BUFFERS);
         setup_tx_ring(sp->srings.tx_desc, SEEQ_TX_BUFFERS);
   
@@ -18314,7 +18488,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
         /* Reset the chip. */
         hpc3_eth_reset(sp->hregs);
   
-@@ -699,7 +703,7 @@
+@@ -699,7 +703,7 @@ int sgiseeq_init(struct hpc3_regs* regs,
                 goto err_out_free_irq;
         }
   
@@ -18323,7 +18497,7 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
         for (i = 0; i < 6; i++)
                 printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
   
-@@ -721,10 +725,22 @@
+@@ -721,10 +725,22 @@ err_out:
   
   static int __init sgiseeq_probe(void)
   {
@@ -18348,17 +18522,18 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
   }
   
   static void __exit sgiseeq_exit(void)
-@@ -747,4 +763,6 @@
+@@ -747,4 +763,6 @@ static void __exit sgiseeq_exit(void)
   module_init(sgiseeq_probe);
   module_exit(sgiseeq_exit);
   
  +MODULE_DESCRIPTION("SGI Seeq 8003 driver");
  +MODULE_AUTHOR("David S. Miller");
   MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.32-rc1/drivers/pci/pci.c linux-2.4.32-rc1.mips/drivers/pci/pci.c
---- linux-2.4.32-rc1/drivers/pci/pci.c 2004-11-17 12:54:21.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/pci/pci.c    2004-11-19 01:28:41.000000000 +0100
-@@ -1281,11 +1281,17 @@
+Index: linux-2.4.35.4/drivers/pci/pci.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/pci/pci.c
++++ linux-2.4.35.4/drivers/pci/pci.c
+@@ -1281,11 +1281,17 @@ static int __devinit pci_scan_bridge(str
   {
         unsigned int buses;
         unsigned short cr;
@@ -18376,7 +18551,7 @@ diff -Nur linux-2.4.32-rc1/drivers/pci/pci.c linux-2.4.32-rc1.mips/drivers/pci/p
         if ((buses & 0xffff00) && !pcibios_assign_all_busses()) {
                 /*
                  * Bus already configured by firmware, process it in the first
-@@ -1351,6 +1357,7 @@
+@@ -1351,6 +1357,7 @@ static int __devinit pci_scan_bridge(str
                 pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max);
                 pci_write_config_word(dev, PCI_COMMAND, cr);
         }
@@ -18384,9 +18559,10 @@ diff -Nur linux-2.4.32-rc1/drivers/pci/pci.c linux-2.4.32-rc1.mips/drivers/pci/p
         sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
         return max;
   }
-diff -Nur linux-2.4.32-rc1/drivers/pcmcia/au1000_db1x00.c linux-2.4.32-rc1.mips/drivers/pcmcia/au1000_db1x00.c
---- linux-2.4.32-rc1/drivers/pcmcia/au1000_db1x00.c    2005-01-19 15:09:57.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/pcmcia/au1000_db1x00.c       2005-02-03 07:35:30.000000000 +0100
+Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/pcmcia/au1000_db1x00.c
++++ linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c
  @@ -1,6 +1,6 @@
   /*
    *
@@ -18417,7 +18593,7 @@ diff -Nur linux-2.4.32-rc1/drivers/pcmcia/au1000_db1x00.c linux-2.4.32-rc1.mips/
   
   static int db1x00_pcmcia_init(struct pcmcia_init *init)
   {
-@@ -76,7 +87,7 @@
+@@ -76,7 +87,7 @@ static int 
   db1x00_pcmcia_socket_state(unsigned sock, struct pcmcia_state *state)
   {
         u32 inserted;
@@ -18426,7 +18602,7 @@ diff -Nur linux-2.4.32-rc1/drivers/pcmcia/au1000_db1x00.c linux-2.4.32-rc1.mips/
   
         if(sock > PCMCIA_MAX_SOCK) return -1;
   
-@@ -87,11 +98,11 @@
+@@ -87,11 +98,11 @@ db1x00_pcmcia_socket_state(unsigned sock
   
         if (sock == 0) {
                 vs = bcsr->status & 0x3;
@@ -18440,7 +18616,7 @@ diff -Nur linux-2.4.32-rc1/drivers/pcmcia/au1000_db1x00.c linux-2.4.32-rc1.mips/
         }
   
         DEBUG(KERN_DEBUG "db1x00 socket %d: inserted %d, vs %d\n", 
-@@ -144,16 +155,9 @@
+@@ -144,16 +155,9 @@ static int db1x00_pcmcia_get_irq_info(st
         if(info->sock > PCMCIA_MAX_SOCK) return -1;
   
         if(info->sock == 0)
@@ -18459,10 +18635,11 @@ diff -Nur linux-2.4.32-rc1/drivers/pcmcia/au1000_db1x00.c linux-2.4.32-rc1.mips/
         return 0;
   }
   
-diff -Nur linux-2.4.32-rc1/drivers/pcmcia/Config.in linux-2.4.32-rc1.mips/drivers/pcmcia/Config.in
---- linux-2.4.32-rc1/drivers/pcmcia/Config.in  2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/pcmcia/Config.in     2004-02-22 06:21:34.000000000 +0100
-@@ -30,16 +30,14 @@
+Index: linux-2.4.35.4/drivers/pcmcia/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/pcmcia/Config.in
++++ linux-2.4.35.4/drivers/pcmcia/Config.in
+@@ -30,16 +30,14 @@ if [ "$CONFIG_PCMCIA" != "n" ]; then
         dep_tristate '  M8xx support' CONFIG_PCMCIA_M8XX $CONFIG_PCMCIA
      fi
      if [ "$CONFIG_SOC_AU1X00" = "y" ]; then
@@ -18483,10 +18660,11 @@ diff -Nur linux-2.4.32-rc1/drivers/pcmcia/Config.in linux-2.4.32-rc1.mips/driver
      if [ "$CONFIG_VRC4173" = "y" -o "$CONFIG_VRC4173" = "m" ]; then
         dep_tristate '  NEC VRC4173 CARDU support' CONFIG_PCMCIA_VRC4173 $CONFIG_PCMCIA
      fi
-diff -Nur linux-2.4.32-rc1/drivers/pcmcia/Makefile linux-2.4.32-rc1.mips/drivers/pcmcia/Makefile
---- linux-2.4.32-rc1/drivers/pcmcia/Makefile   2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/pcmcia/Makefile      2005-02-03 07:35:30.000000000 +0100
-@@ -61,9 +61,18 @@
+Index: linux-2.4.35.4/drivers/pcmcia/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/pcmcia/Makefile
++++ linux-2.4.35.4/drivers/pcmcia/Makefile
+@@ -61,9 +61,18 @@ endif
   
   obj-$(CONFIG_PCMCIA_AU1X00)                   += au1x00_ss.o
   au1000_ss-objs-y                              := au1000_generic.o
@@ -18508,7 +18686,7 @@ diff -Nur linux-2.4.32-rc1/drivers/pcmcia/Makefile linux-2.4.32-rc1.mips/drivers
   
   obj-$(CONFIG_PCMCIA_SA1100)   += sa1100_cs.o
   obj-$(CONFIG_PCMCIA_M8XX)     += m8xx_pcmcia.o
-@@ -89,6 +98,7 @@
+@@ -89,6 +98,7 @@ sa1100_cs-objs-$(CONFIG_SA1100_STORK)                +
   sa1100_cs-objs-$(CONFIG_SA1100_XP860)         += sa1100_xp860.o sa1111_generic.o
   sa1100_cs-objs-$(CONFIG_SA1100_YOPY)          += sa1100_yopy.o
   
@@ -18516,9 +18694,10 @@ diff -Nur linux-2.4.32-rc1/drivers/pcmcia/Makefile linux-2.4.32-rc1.mips/drivers
   obj-$(CONFIG_PCMCIA_VRC4173)  += vrc4173_cardu.o
   
   include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.32-rc1/drivers/pcmcia/vrc4171_card.c linux-2.4.32-rc1.mips/drivers/pcmcia/vrc4171_card.c
---- linux-2.4.32-rc1/drivers/pcmcia/vrc4171_card.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/pcmcia/vrc4171_card.c        2004-01-19 16:54:58.000000000 +0100
+Index: linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c
  @@ -0,0 +1,886 @@
  +/*
  + * vrc4171_card.c, NEC VRC4171 Card Controller driver for Socket Services.
@@ -19406,9 +19585,10 @@ diff -Nur linux-2.4.32-rc1/drivers/pcmcia/vrc4171_card.c linux-2.4.32-rc1.mips/d
  +
  +module_init(vrc4171_card_init);
  +module_exit(vrc4171_card_exit);
-diff -Nur linux-2.4.32-rc1/drivers/scsi/NCR53C9x.h linux-2.4.32-rc1.mips/drivers/scsi/NCR53C9x.h
---- linux-2.4.32-rc1/drivers/scsi/NCR53C9x.h   2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/scsi/NCR53C9x.h      2003-12-15 19:19:51.000000000 +0100
+Index: linux-2.4.35.4/drivers/scsi/NCR53C9x.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/scsi/NCR53C9x.h
++++ linux-2.4.35.4/drivers/scsi/NCR53C9x.h
  @@ -144,12 +144,7 @@
   
   #ifndef MULTIPLE_PAD_SIZES
@@ -19423,9 +19603,10 @@ diff -Nur linux-2.4.32-rc1/drivers/scsi/NCR53C9x.h linux-2.4.32-rc1.mips/drivers
   #define esp_read(__reg) (__reg)
   
   struct ESP_regs {
-diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/drivers/sound/au1550_i2s.c
---- linux-2.4.32-rc1/drivers/sound/au1550_i2s.c        2005-01-19 15:10:04.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/sound/au1550_i2s.c   2005-02-08 08:07:50.000000000 +0100
+Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/sound/au1550_i2s.c
++++ linux-2.4.35.4/drivers/sound/au1550_i2s.c
  @@ -41,6 +41,7 @@
    *  675 Mass Ave, Cambridge, MA 02139, USA.
    *
@@ -19532,7 +19713,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
   
         spinlock_t              lock;
         struct semaphore        open_sem;
-@@ -114,6 +191,11 @@
+@@ -114,6 +191,11 @@ static struct au1550_state {
         int                     no_vra;
         volatile psc_i2s_t      *psc_addr;
   
@@ -19544,7 +19725,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
         struct dmabuf {
                 u32             dmanr;
                 unsigned        sample_rate;
-@@ -195,60 +277,224 @@
+@@ -195,60 +277,224 @@ au1550_delay(int msec)
         }
   }
   
@@ -19807,7 +19988,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
   }
   
   /* stop the ADC before calling */
-@@ -256,27 +502,16 @@
+@@ -256,27 +502,16 @@ static void
   set_adc_rate(struct au1550_state *s, unsigned rate)
   {
         struct dmabuf  *adc = &s->dma_adc;
@@ -19839,7 +20020,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
   }
   
   /* stop the DAC before calling */
-@@ -284,26 +519,89 @@
+@@ -284,26 +519,89 @@ static void
   set_dac_rate(struct au1550_state *s, unsigned rate)
   {
         struct dmabuf  *dac = &s->dma_dac;
@@ -19942,7 +20123,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
   }
   
   static void
-@@ -354,8 +652,7 @@
+@@ -354,8 +652,7 @@ stop_adc(struct au1550_state *s)
         ip->psc_i2spcr = PSC_I2SPCR_RP;
         au_sync();
   
@@ -19952,7 +20133,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
         do {
                 stat = ip->psc_i2sstat;
                 au_sync();
-@@ -463,7 +760,6 @@
+@@ -463,7 +760,6 @@ prog_dmabuf(struct au1550_state *s, stru
         if (db->num_channels == 1)
                 db->cnt_factor *= 2;
         db->cnt_factor *= db->src_factor;
@@ -19960,7 +20141,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
         db->count = 0;
         db->dma_qcount = 0;
         db->nextIn = db->nextOut = db->rawbuf;
-@@ -546,12 +842,13 @@
+@@ -546,12 +842,13 @@ dac_dma_interrupt(int irq, void *dev_id,
         if (i2s_stat & (PSC_I2SSTAT_TF | PSC_I2SSTAT_TR | PSC_I2SSTAT_TF))
                 dbg("I2S status = 0x%08x", i2s_stat);
   #endif
@@ -19977,7 +20158,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
                 }
                 db->nextOut += db->fragsize;
                 if (db->nextOut >= db->rawbuf + db->dmasize)
-@@ -606,65 +903,43 @@
+@@ -606,65 +903,43 @@ adc_dma_interrupt(int irq, void *dev_id,
   
   }
   
@@ -20069,7 +20250,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
                 spin_unlock_irqrestore(&s->lock, flags);
                 if (count <= 0)
                         break;
-@@ -672,9 +947,9 @@
+@@ -672,9 +947,9 @@ drain_dac(struct au1550_state *s, int no
                         break;
                 if (nonblock)
                         return -EBUSY;
@@ -20081,7 +20262,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
                 au1550_delay(tmo);
         }
         if (signal_pending(current))
-@@ -698,8 +973,7 @@
+@@ -698,8 +973,7 @@ static inline s16 U8_TO_S16(u8 ch)
    *     If interpolating (no VRA), duplicate every audio frame src_factor times.
    */
   static int
@@ -20091,7 +20272,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
   {
         int             sample, i;
         int             interp_bytes_per_sample;
-@@ -737,11 +1011,12 @@
+@@ -737,11 +1011,12 @@ translate_from_user(struct dmabuf *db, c
   
                 /* duplicate every audio frame src_factor times
                 */
@@ -20106,7 +20287,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
         }
   
         return num_samples * interp_bytes_per_sample;
-@@ -996,15 +1271,14 @@
+@@ -996,15 +1271,14 @@ au1550_write(struct file *file, const ch
                  * on the dma queue.  If the queue count reaches zero,
                  * we know the dma has stopped.
                  */
@@ -20124,7 +20305,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
                         db->total_bytes += db->dma_fragsize;
                         if (db->dma_qcount == 0)
                                 start_dac(s);
-@@ -1017,7 +1291,6 @@
+@@ -1017,7 +1291,6 @@ au1550_write(struct file *file, const ch
                 buffer += usercnt;
                 ret += usercnt;
         }                       /* while (count > 0) */
@@ -20132,7 +20313,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
   out:
         up(&s->sem);
   out2:
-@@ -1371,9 +1644,6 @@
+@@ -1371,9 +1644,6 @@ au1550_ioctl(struct inode *inode, struct
                         s->dma_dac.cnt_factor;
                 abinfo.fragstotal = s->dma_dac.numfrag;
                 abinfo.fragments = abinfo.bytes >> s->dma_dac.fragshift;
@@ -20142,7 +20323,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
                 return copy_to_user((void *) arg, &abinfo,
                                     sizeof(abinfo)) ? -EFAULT : 0;
   
-@@ -1536,13 +1806,9 @@
+@@ -1536,13 +1806,9 @@ au1550_ioctl(struct inode *inode, struct
         case SNDCTL_DSP_SETSYNCRO:
         case SOUND_PCM_READ_FILTER:
                 return -EINVAL;
@@ -20157,7 +20338,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
   }
   
   
-@@ -1664,15 +1930,15 @@
+@@ -1664,15 +1930,15 @@ static /*const */ struct file_operations
   MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com");
   MODULE_DESCRIPTION("Au1550 Audio Driver");
   
@@ -20176,7 +20357,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
          * We know SMBus uses Freq3.
          * By making changes to this rate, plus the word strobe
          * size, we can make fine adjustments to the actual data rate.
-@@ -1700,11 +1966,17 @@
+@@ -1700,11 +1966,17 @@ intclk_setup(void)
         */
         clk = au_readl(SYS_CLKSRC);
         au_sync();
@@ -20194,7 +20375,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
   
   static int __devinit
   au1550_probe(void)
-@@ -1724,6 +1996,11 @@
+@@ -1724,6 +1996,11 @@ au1550_probe(void)
         init_MUTEX(&s->open_sem);
         spin_lock_init(&s->lock);
   
@@ -20206,7 +20387,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
   
         s->psc_addr = (volatile psc_i2s_t *)I2S_PSC_BASE;
         ip = s->psc_addr;
-@@ -1765,9 +2042,8 @@
+@@ -1765,9 +2042,8 @@ au1550_probe(void)
   
         if ((s->dev_audio = register_sound_dsp(&au1550_audio_fops, -1)) < 0)
                 goto err_dev1;
@@ -20218,7 +20399,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
                 goto err_dev2;
   #endif
   
-@@ -1777,7 +2053,6 @@
+@@ -1777,7 +2053,6 @@ au1550_probe(void)
                                        proc_au1550_dump, NULL);
   #endif /* AU1550_DEBUG */
   
@@ -20226,7 +20407,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
   
         /* The GPIO for the appropriate PSC was configured by the
          * board specific start up.
-@@ -1786,7 +2061,12 @@
+@@ -1786,7 +2061,12 @@ au1550_probe(void)
          */
         ip->psc_ctrl = PSC_CTRL_DISABLE;        /* Disable PSC */
         au_sync();
@@ -20239,7 +20420,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
         au_sync();
   
         /* Enable PSC
-@@ -1806,42 +2086,18 @@
+@@ -1806,42 +2086,18 @@ au1550_probe(void)
          * Actual I2S mode (first bit delayed by one clock).
          * Master mode (We provide the clock from the PSC).
          */
@@ -20288,7 +20469,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
         if (s->no_vra)
                 info("no VRA, interpolating and decimating");
   
-@@ -1866,6 +2122,8 @@
+@@ -1866,6 +2122,8 @@ au1550_probe(void)
    err_dev2:
         unregister_sound_dsp(s->dev_audio);
   #endif
@@ -20297,9 +20478,10 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_i2s.c linux-2.4.32-rc1.mips/driv
    err_dev1:
         au1xxx_dbdma_chan_free(s->dma_adc.dmanr);
    err_dma2:
-diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/drivers/sound/au1550_psc.c
---- linux-2.4.32-rc1/drivers/sound/au1550_psc.c        2005-01-19 15:10:04.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/sound/au1550_psc.c   2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/drivers/sound/au1550_psc.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/sound/au1550_psc.c
++++ linux-2.4.35.4/drivers/sound/au1550_psc.c
  @@ -30,6 +30,7 @@
    *  675 Mass Ave, Cambridge, MA 02139, USA.
    *
@@ -20323,7 +20505,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
   #undef OSS_DOCUMENTED_MIXER_SEMANTICS
   
   #define AU1550_MODULE_NAME "Au1550 psc audio"
-@@ -521,7 +530,14 @@
+@@ -521,7 +530,14 @@ stop_adc(struct au1550_state *s)
         spin_unlock_irqrestore(&s->lock, flags);
   }
   
@@ -20339,7 +20521,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
   static void
   set_xmit_slots(int num_channels)
   {
-@@ -565,6 +581,14 @@
+@@ -565,6 +581,14 @@ set_xmit_slots(int num_channels)
         } while ((stat & PSC_AC97STAT_DR) == 0);
   }
   
@@ -20354,7 +20536,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
   static void
   set_recv_slots(int num_channels)
   {
-@@ -608,7 +632,6 @@
+@@ -608,7 +632,6 @@ start_dac(struct au1550_state *s)
   
         spin_lock_irqsave(&s->lock, flags);
   
@@ -20362,7 +20544,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
         au_writel(PSC_AC97PCR_TC, PSC_AC97PCR);
         au_sync();
         au_writel(PSC_AC97PCR_TS, PSC_AC97PCR);
-@@ -640,7 +663,6 @@
+@@ -640,7 +663,6 @@ start_adc(struct au1550_state *s)
                         db->nextIn -= db->dmasize;
         }
   
@@ -20370,7 +20552,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
         au1xxx_dbdma_start(db->dmanr);
         au_writel(PSC_AC97PCR_RC, PSC_AC97PCR);
         au_sync();
-@@ -752,12 +774,16 @@
+@@ -752,12 +774,16 @@ dac_dma_interrupt(int irq, void *dev_id,
         if (ac97c_stat & (AC97C_XU | AC97C_XO | AC97C_TE))
                 dbg("AC97C status = 0x%08x", ac97c_stat);
   #endif
@@ -20388,7 +20570,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
                 }
                 db->nextOut += db->fragsize;
                 if (db->nextOut >= db->rawbuf + db->dmasize)
-@@ -941,11 +967,12 @@
+@@ -941,11 +967,12 @@ translate_from_user(struct dmabuf *db, c
   
                 /* duplicate every audio frame src_factor times
                 */
@@ -20403,7 +20585,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
         }
   
         return num_samples * interp_bytes_per_sample;
-@@ -1203,7 +1230,7 @@
+@@ -1203,7 +1230,7 @@ au1550_write(struct file *file, const ch
                 while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) {
                         if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut,
                                                         db->fragsize) == 0) {
@@ -20412,7 +20594,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
                         }
                         db->nextOut += db->fragsize;
                         if (db->nextOut >= db->rawbuf + db->dmasize)
-@@ -1481,6 +1508,7 @@
+@@ -1481,6 +1508,7 @@ au1550_ioctl(struct inode *inode, struct
                                         return -EINVAL;
                                 stop_adc(s);
                                 s->dma_adc.num_channels = val;
@@ -20420,7 +20602,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
                                 if ((ret = prog_dmabuf_adc(s)))
                                         return ret;
                         }
-@@ -1538,6 +1566,7 @@
+@@ -1538,6 +1566,7 @@ au1550_ioctl(struct inode *inode, struct
                                 }
   
                                 s->dma_dac.num_channels = val;
@@ -20428,7 +20610,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
                                 if ((ret = prog_dmabuf_dac(s)))
                                         return ret;
                         }
-@@ -1832,10 +1861,8 @@
+@@ -1832,10 +1861,8 @@ au1550_open(struct inode *inode, struct 
                 down(&s->open_sem);
         }
   
@@ -20440,7 +20622,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
                 s->dma_adc.ossfragshift = s->dma_adc.ossmaxfrags =
                         s->dma_adc.subdivision = s->dma_adc.total_bytes = 0;
                 s->dma_adc.num_channels = 1;
-@@ -1846,6 +1873,7 @@
+@@ -1846,6 +1873,7 @@ au1550_open(struct inode *inode, struct 
         }
   
         if (file->f_mode & FMODE_WRITE) {
@@ -20448,7 +20630,7 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
                 s->dma_dac.ossfragshift = s->dma_dac.ossmaxfrags =
                         s->dma_dac.subdivision = s->dma_dac.total_bytes = 0;
                 s->dma_dac.num_channels = 1;
-@@ -2091,6 +2119,9 @@
+@@ -2091,6 +2119,9 @@ au1550_probe(void)
                                              ac97_read_proc, &s->codec);
   #endif
   
@@ -20458,10 +20640,11 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/au1550_psc.c linux-2.4.32-rc1.mips/driv
         return 0;
   
    err_dev3:
-diff -Nur linux-2.4.32-rc1/drivers/sound/Config.in linux-2.4.32-rc1.mips/drivers/sound/Config.in
---- linux-2.4.32-rc1/drivers/sound/Config.in   2005-01-19 15:10:04.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/sound/Config.in      2005-04-21 07:53:07.000000000 +0200
-@@ -72,10 +72,15 @@
+Index: linux-2.4.35.4/drivers/sound/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/sound/Config.in
++++ linux-2.4.35.4/drivers/sound/Config.in
+@@ -72,10 +72,15 @@ fi
   if [ "$CONFIG_DDB5477" = "y" ]; then
       dep_tristate '  NEC Vrc5477 AC97 sound' CONFIG_SOUND_VRC5477 $CONFIG_SOUND
   fi
@@ -20481,9 +20664,10 @@ diff -Nur linux-2.4.32-rc1/drivers/sound/Config.in linux-2.4.32-rc1.mips/drivers
   fi
   
   dep_tristate '  Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core' CONFIG_SOUND_TRIDENT $CONFIG_SOUND $CONFIG_PCI
-diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/lk201.c
---- linux-2.4.32-rc1/drivers/tc/lk201.c        2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/tc/lk201.c   2004-09-28 02:53:04.000000000 +0200
+Index: linux-2.4.35.4/drivers/tc/lk201.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/tc/lk201.c
++++ linux-2.4.35.4/drivers/tc/lk201.c
  @@ -5,7 +5,7 @@
    * for more details.
    *
@@ -20503,7 +20687,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
   #include "lk201.h"
   
   /*
-@@ -55,19 +55,20 @@
+@@ -55,19 +55,20 @@ unsigned char *kbd_sysrq_xlate = lk201_s
   unsigned char kbd_sysrq_key = -1;
   #endif
   
@@ -20530,7 +20714,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
   };
   
   /*
-@@ -93,28 +94,28 @@
+@@ -93,28 +94,28 @@ static unsigned char lk201_reset_string[
         LK_CMD_ENB_BELL, LK_PARAM_VOLUME(4),
   };
   
@@ -20566,7 +20750,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
                 if (r < 0)
                         return r;
         }
-@@ -203,24 +204,26 @@
+@@ -203,24 +204,26 @@ static void parse_kbd_rate(struct kbd_re
   
   static int write_kbd_rate(struct kbd_repeat *rep)
   {
@@ -20598,7 +20782,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
   {
         if (rep == NULL)
                 return -EINVAL;
-@@ -237,10 +240,8 @@
+@@ -237,10 +240,8 @@ static int lk201kbd_rate(struct kbd_repe
         return 0;
   }
   
@@ -20610,7 +20794,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
         if (!ticks)
                 return;
   
-@@ -253,20 +254,19 @@
+@@ -253,20 +254,19 @@ static void lk201kd_mksound(unsigned int
                 ticks = 7;
         ticks = 7 - ticks;
   
@@ -20635,7 +20819,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
                 return;
   
         /* FIXME -- Only Hold and Lock LEDs for now. --macro */
-@@ -275,13 +275,13 @@
+@@ -275,13 +275,13 @@ void kbd_leds(unsigned char leds)
         if (leds & LED_CAP)
                 l |= LK_LED_LOCK;
   
@@ -20653,7 +20837,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
                 return;
   }
   
-@@ -307,7 +307,7 @@
+@@ -307,7 +307,7 @@ char kbd_unexpected_up(unsigned char key
         return 0x80;
   }
   
@@ -20662,7 +20846,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
   {
         static unsigned char id[6];
         static int id_i;
-@@ -316,9 +316,8 @@
+@@ -316,9 +316,8 @@ static void lk201_kbd_rx_char(unsigned c
         static int prev_scancode;
         unsigned char c = scancodeRemap[ch];
   
@@ -20674,7 +20858,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
                 return;
         }
   
-@@ -335,7 +334,7 @@
+@@ -335,7 +334,7 @@ static void lk201_kbd_rx_char(unsigned c
                         /* OK, the power-up concluded. */
                         lk201_report(id);
                         if (id[2] == LK_STAT_PWRUP_OK)
@@ -20683,7 +20867,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
                         else {
                                 id_i = 0;
                                 printk(KERN_ERR "lk201: keyboard power-up "
-@@ -345,7 +344,7 @@
+@@ -345,7 +344,7 @@ static void lk201_kbd_rx_char(unsigned c
                         /* We got the ID; report it and start operation. */
                         id_i = 0;
                         lk201_id(id);
@@ -20692,7 +20876,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
                 }
                 return;
         }
-@@ -398,29 +397,28 @@
+@@ -398,29 +397,28 @@ static void lk201_kbd_rx_char(unsigned c
         tasklet_schedule(&keyboard_tasklet);
   }
   
@@ -20730,7 +20914,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
   
         /* Maxine uses LK501 at the Access.Bus. */
         if (!LK_IFACE)
-@@ -428,19 +426,15 @@
+@@ -428,19 +426,15 @@ void __init kbd_init_hw(void)
   
         printk(KERN_INFO "lk201: DECstation LK keyboard driver v0.05.\n");
   
@@ -20761,9 +20945,10 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/lk201.c linux-2.4.32-rc1.mips/drivers/tc/l
  +      if (!register_dec_serial_hook(keyb_line, &lk201_hook))
  +              unregister_dec_serial_hook(keyb_line);
   }
-diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
---- linux-2.4.32-rc1/drivers/tc/zs.c   2005-01-19 15:10:05.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/tc/zs.c      2004-12-27 05:13:50.000000000 +0100
+Index: linux-2.4.35.4/drivers/tc/zs.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/tc/zs.c
++++ linux-2.4.35.4/drivers/tc/zs.c
  @@ -68,6 +68,8 @@
   #include <asm/bitops.h>
   #include <asm/uaccess.h>
@@ -20773,7 +20958,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   #ifdef CONFIG_DECSTATION
   #include <asm/dec/interrupts.h>
   #include <asm/dec/machtype.h>
-@@ -160,8 +162,8 @@
+@@ -160,8 +162,8 @@ struct tty_struct zs_ttys[NUM_CHANNELS];
   #ifdef CONFIG_SERIAL_DEC_CONSOLE
   static struct console sercons;
   #endif
@@ -20784,7 +20969,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   static unsigned long break_pressed; /* break, really ... */
   #endif
   
-@@ -196,7 +198,6 @@
+@@ -196,7 +198,6 @@ static int serial_refcount;
   /*
    * Debugging.
    */
@@ -20792,7 +20977,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   #undef SERIAL_DEBUG_OPEN
   #undef SERIAL_DEBUG_FLOW
   #undef SERIAL_DEBUG_THROTTLE
-@@ -221,10 +222,6 @@
+@@ -221,10 +222,6 @@ static struct tty_struct *serial_table[N
   static struct termios *serial_termios[NUM_CHANNELS];
   static struct termios *serial_termios_locked[NUM_CHANNELS];
   
@@ -20803,7 +20988,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   /*
    * tmp_buf is used as a temporary buffer by serial_write.  We need to
    * lock it in case the copy_from_user blocks while swapping in a page,
-@@ -386,8 +383,6 @@
+@@ -386,8 +383,6 @@ static inline void rs_recv_clear(struct 
    * -----------------------------------------------------------------------
    */
   
@@ -20812,7 +20997,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   /*
    * This routine is used by the interrupt handler to schedule
    * processing in the software interrupt portion of the driver.
-@@ -414,20 +409,15 @@
+@@ -414,20 +409,15 @@ static _INLINE_ void receive_chars(struc
                 if (!tty && (!info->hook || !info->hook->rx_char))
                         continue;
   
@@ -20839,7 +21024,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
                 } else {
                         if (stat & Rx_OVR) {
                                 flag = TTY_OVERRUN;
-@@ -435,20 +425,22 @@
+@@ -435,20 +425,22 @@ static _INLINE_ void receive_chars(struc
                                 flag = TTY_FRAME;
                         } else if (stat & PAR_ERR) {
                                 flag = TTY_PARITY;
@@ -20869,7 +21054,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
                         }
                         break_pressed = 0;
                 }
-@@ -459,23 +451,7 @@
+@@ -459,23 +451,7 @@ static _INLINE_ void receive_chars(struc
                         return;
                 }
   
@@ -20894,7 +21079,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
         }
         if (tty)
                 tty_flip_buffer_push(tty);
-@@ -517,11 +493,15 @@
+@@ -517,11 +493,15 @@ static _INLINE_ void status_handle(struc
         /* Get status from Read Register 0 */
         stat = read_zsreg(info->zs_channel, R0);
   
@@ -20914,7 +21099,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
         }
   
         if (info->zs_channel != info->zs_chan_a) {
-@@ -957,7 +937,7 @@
+@@ -957,7 +937,7 @@ static int rs_write(struct tty_struct * 
         save_flags(flags);
         while (1) {
                 cli();
@@ -20923,7 +21108,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
                                    SERIAL_XMIT_SIZE - info->xmit_head));
                 if (c <= 0)
                         break;
-@@ -965,7 +945,7 @@
+@@ -965,7 +945,7 @@ static int rs_write(struct tty_struct * 
                 if (from_user) {
                         down(&tmp_buf_sem);
                         copy_from_user(tmp_buf, buf, c);
@@ -20932,7 +21117,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
                                        SERIAL_XMIT_SIZE - info->xmit_head));
                         memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
                         up(&tmp_buf_sem);
-@@ -1282,46 +1262,48 @@
+@@ -1282,46 +1262,48 @@ static int rs_ioctl(struct tty_struct *t
         }
   
         switch (cmd) {
@@ -21019,7 +21204,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
         return 0;
   }
   
-@@ -1446,7 +1428,8 @@
+@@ -1446,7 +1428,8 @@ static void rs_close(struct tty_struct *
   static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
   {
         struct dec_serial *info = (struct dec_serial *) tty->driver_data;
@@ -21029,7 +21214,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   
         if (serial_paranoia_check(info, tty->device, "rs_wait_until_sent"))
                 return;
-@@ -1462,7 +1445,7 @@
+@@ -1462,7 +1445,7 @@ static void rs_wait_until_sent(struct tt
         if (char_time == 0)
                 char_time = 1;
         if (timeout)
@@ -21038,7 +21223,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
         while ((read_zsreg(info->zs_channel, 1) & Tx_BUF_EMP) == 0) {
                 current->state = TASK_INTERRUPTIBLE;
                 schedule_timeout(char_time);
-@@ -1714,7 +1697,7 @@
+@@ -1714,7 +1697,7 @@ int rs_open(struct tty_struct *tty, stru
   
   static void __init show_serial_version(void)
   {
@@ -21047,7 +21232,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   }
   
   /*  Initialize Z8530s zs_channels
-@@ -1994,8 +1977,9 @@
+@@ -1994,8 +1977,9 @@ int __init zs_init(void)
    * polling I/O routines
    */
   static int
@@ -21058,7 +21243,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
         struct dec_zschannel *chan = info->zs_channel;
         int    ret;
   
-@@ -2017,8 +2001,9 @@
+@@ -2017,8 +2001,9 @@ zs_poll_tx_char(struct dec_serial *info,
   }
   
   static int
@@ -21069,7 +21254,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
           struct dec_zschannel *chan = info->zs_channel;
           int    ret;
   
-@@ -2038,12 +2023,13 @@
+@@ -2038,12 +2023,13 @@ zs_poll_rx_char(struct dec_serial *info)
                 return -ENODEV;
   }
   
@@ -21085,7 +21270,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   
                 return 0;
         } else {
-@@ -2055,7 +2041,7 @@
+@@ -2055,7 +2041,7 @@ unsigned int register_zs_hook(unsigned i
         }
   }
   
@@ -21094,7 +21279,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   {
         struct dec_serial *info = &zs_soft[channel];
   
-@@ -2063,8 +2049,8 @@
+@@ -2063,8 +2049,8 @@ unsigned int unregister_zs_hook(unsigned
                   info->hook = NULL;
                   return 1;
           } else {
@@ -21105,7 +21290,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
                   return 0;
           }
   }
-@@ -2319,22 +2305,23 @@
+@@ -2319,22 +2305,23 @@ void kgdb_interruptible(int yes)
         write_zsreg(chan, 9, nine);
   }
   
@@ -21135,7 +21320,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   }
   
   /* This sets up the serial port we're using, and turns on
-@@ -2360,11 +2347,11 @@
+@@ -2360,11 +2347,11 @@ static inline void kgdb_chaninit(struct 
    * for /dev/ttyb which is determined in setup_arch() from the
    * boot command line flags.
    */
@@ -21152,9 +21337,10 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.c linux-2.4.32-rc1.mips/drivers/tc/zs.c
   }
   
   void __init zs_kgdb_hook(int tty_num)
-diff -Nur linux-2.4.32-rc1/drivers/tc/zs.h linux-2.4.32-rc1.mips/drivers/tc/zs.h
---- linux-2.4.32-rc1/drivers/tc/zs.h   2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/tc/zs.h      2004-07-01 15:28:54.000000000 +0200
+Index: linux-2.4.35.4/drivers/tc/zs.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/tc/zs.h
++++ linux-2.4.35.4/drivers/tc/zs.h
  @@ -1,14 +1,18 @@
   /*
  - * macserial.h: Definitions for the Macintosh Z8530 serial driver.
@@ -21175,7 +21361,7 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.h linux-2.4.32-rc1.mips/drivers/tc/zs.h
   #define NUM_ZSREGS    16
   
   struct serial_struct {
-@@ -89,63 +93,50 @@
+@@ -89,63 +93,50 @@ struct dec_zschannel {
         unsigned char curregs[NUM_ZSREGS];
   };
   
@@ -21263,9 +21449,10 @@ diff -Nur linux-2.4.32-rc1/drivers/tc/zs.h linux-2.4.32-rc1.mips/drivers/tc/zs.h
         unsigned char           *xmit_buf;
         int                     xmit_head;
         int                     xmit_tail;
-diff -Nur linux-2.4.32-rc1/drivers/video/au1200fb.c linux-2.4.32-rc1.mips/drivers/video/au1200fb.c
---- linux-2.4.32-rc1/drivers/video/au1200fb.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/video/au1200fb.c     2005-03-13 09:04:16.000000000 +0100
+Index: linux-2.4.35.4/drivers/video/au1200fb.c
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/video/au1200fb.c
  @@ -0,0 +1,1564 @@
  +/*
  + * BRIEF MODULE DESCRIPTION
@@ -22831,9 +23018,10 @@ diff -Nur linux-2.4.32-rc1/drivers/video/au1200fb.c linux-2.4.32-rc1.mips/driver
  +#endif /* MODULE */
  +
  +
-diff -Nur linux-2.4.32-rc1/drivers/video/au1200fb.h linux-2.4.32-rc1.mips/drivers/video/au1200fb.h
---- linux-2.4.32-rc1/drivers/video/au1200fb.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/video/au1200fb.h     2005-02-11 22:16:44.000000000 +0100
+Index: linux-2.4.35.4/drivers/video/au1200fb.h
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/video/au1200fb.h
  @@ -0,0 +1,288 @@
  +/*
  + * BRIEF MODULE DESCRIPTION
@@ -23123,10 +23311,11 @@ diff -Nur linux-2.4.32-rc1/drivers/video/au1200fb.h linux-2.4.32-rc1.mips/driver
  +
  +/********************************************************************/
  +#endif /* _AU1200LCD_H */
-diff -Nur linux-2.4.32-rc1/drivers/video/Config.in linux-2.4.32-rc1.mips/drivers/video/Config.in
---- linux-2.4.32-rc1/drivers/video/Config.in   2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/video/Config.in      2005-02-11 22:16:44.000000000 +0100
-@@ -87,8 +87,8 @@
+Index: linux-2.4.35.4/drivers/video/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/video/Config.in
++++ linux-2.4.35.4/drivers/video/Config.in
+@@ -87,8 +87,8 @@ if [ "$CONFIG_FB" = "y" ]; then
      if [ "$CONFIG_HP300" = "y" ]; then
         define_bool CONFIG_FB_HP300 y
      fi
@@ -23137,7 +23326,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/Config.in linux-2.4.32-rc1.mips/drivers
      fi
      if [ "$CONFIG_X86" = "y" ]; then
         bool '  VESA VGA graphics console' CONFIG_FB_VESA
-@@ -121,6 +121,17 @@
+@@ -121,6 +121,17 @@ if [ "$CONFIG_FB" = "y" ]; then
            hex '    Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
         fi
      fi
@@ -23155,7 +23344,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/Config.in linux-2.4.32-rc1.mips/drivers
      if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
         if [ "$CONFIG_PCI" != "n" ]; then
          tristate '  Matrox acceleration (EXPERIMENTAL)' CONFIG_FB_MATROX
-@@ -178,9 +189,6 @@
+@@ -178,9 +189,6 @@ if [ "$CONFIG_FB" = "y" ]; then
              bool '    Use CRT on Pb1100 ' CONFIG_PB1500_CRT
              bool '    Use TFT Panel on Pb1100 ' CONFIG_PB1500_TFT
              fi
@@ -23165,10 +23354,11 @@ diff -Nur linux-2.4.32-rc1/drivers/video/Config.in linux-2.4.32-rc1.mips/drivers
          fi
         fi
      fi
-diff -Nur linux-2.4.32-rc1/drivers/video/fbmem.c linux-2.4.32-rc1.mips/drivers/video/fbmem.c
---- linux-2.4.32-rc1/drivers/video/fbmem.c     2005-06-01 02:56:56.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/video/fbmem.c        2005-05-25 19:14:24.000000000 +0200
-@@ -139,6 +139,8 @@
+Index: linux-2.4.35.4/drivers/video/fbmem.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/video/fbmem.c
++++ linux-2.4.35.4/drivers/video/fbmem.c
+@@ -139,6 +139,8 @@ extern int e1356fb_init(void);
   extern int e1356fb_setup(char*);
   extern int au1100fb_init(void);
   extern int au1100fb_setup(char*);
@@ -23177,7 +23367,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/fbmem.c linux-2.4.32-rc1.mips/drivers/v
   extern int pvr2fb_init(void);
   extern int pvr2fb_setup(char*);
   extern int sstfb_init(void);
-@@ -331,6 +333,9 @@
+@@ -331,6 +333,9 @@ static struct {
   #ifdef CONFIG_FB_AU1100
         { "au1100fb", au1100fb_init, au1100fb_setup },
   #endif 
@@ -23187,9 +23377,10 @@ diff -Nur linux-2.4.32-rc1/drivers/video/fbmem.c linux-2.4.32-rc1.mips/drivers/v
   #ifdef CONFIG_FB_IT8181
         { "it8181fb", it8181fb_init, it8181fb_setup },
   #endif
-diff -Nur linux-2.4.32-rc1/drivers/video/ims332.h linux-2.4.32-rc1.mips/drivers/video/ims332.h
---- linux-2.4.32-rc1/drivers/video/ims332.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/video/ims332.h       2003-12-22 17:02:20.000000000 +0100
+Index: linux-2.4.35.4/drivers/video/ims332.h
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/drivers/video/ims332.h
  @@ -0,0 +1,275 @@
  +/*
  + *    linux/drivers/video/ims332.h
@@ -23466,10 +23657,11 @@ diff -Nur linux-2.4.32-rc1/drivers/video/ims332.h linux-2.4.32-rc1.mips/drivers/
  +                              IMS332_CTRL_A_BOOT_ENABLE_VTG);
  +      printk("\n");
  +}
-diff -Nur linux-2.4.32-rc1/drivers/video/Makefile linux-2.4.32-rc1.mips/drivers/video/Makefile
---- linux-2.4.32-rc1/drivers/video/Makefile    2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/video/Makefile       2005-02-11 22:16:44.000000000 +0100
-@@ -87,6 +87,7 @@
+Index: linux-2.4.35.4/drivers/video/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/video/Makefile
++++ linux-2.4.35.4/drivers/video/Makefile
+@@ -87,6 +87,7 @@ obj-$(CONFIG_FB_PMAGB_B)          += pma
   obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
   obj-$(CONFIG_FB_TX3912)           += tx3912fb.o
   obj-$(CONFIG_FB_AU1100)                 += au1100fb.o fbgen.o
@@ -23477,9 +23669,10 @@ diff -Nur linux-2.4.32-rc1/drivers/video/Makefile linux-2.4.32-rc1.mips/drivers/
   obj-$(CONFIG_FB_IT8181)                 += it8181fb.o fbgen.o
   
   subdir-$(CONFIG_STI_CONSOLE)      += sti
-diff -Nur linux-2.4.32-rc1/drivers/video/maxinefb.h linux-2.4.32-rc1.mips/drivers/video/maxinefb.h
---- linux-2.4.32-rc1/drivers/video/maxinefb.h  2003-08-25 13:44:42.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/video/maxinefb.h     1970-01-01 01:00:00.000000000 +0100
+Index: linux-2.4.35.4/drivers/video/maxinefb.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/video/maxinefb.h
++++ /dev/null
  @@ -1,38 +0,0 @@
  -/*
  - *      linux/drivers/video/maxinefb.h
@@ -23519,9 +23712,10 @@ diff -Nur linux-2.4.32-rc1/drivers/video/maxinefb.h linux-2.4.32-rc1.mips/driver
  -#define IMS332_REG_COLOR_PALETTE        0x100 /* color palette, 256 entries */
  -#define IMS332_REG_CURSOR_COLOR_PALETTE       0x0a1   /* cursor color palette, */
  -                                              /* 3 entries             */
-diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/drivers/video/newport_con.c
---- linux-2.4.32-rc1/drivers/video/newport_con.c       2003-08-25 13:44:42.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/video/newport_con.c  2004-09-23 15:32:29.000000000 +0200
+Index: linux-2.4.35.4/drivers/video/newport_con.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/video/newport_con.c
++++ linux-2.4.35.4/drivers/video/newport_con.c
  @@ -22,6 +22,7 @@
   #include <linux/module.h>
   #include <linux/slab.h>
@@ -23530,7 +23724,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
   #include <asm/uaccess.h>
   #include <asm/system.h>
   #include <asm/page.h>
-@@ -77,7 +78,7 @@
+@@ -77,7 +78,7 @@ static int newport_set_def_font(int unit
   static inline void newport_render_background(int xstart, int ystart,
                                              int xend, int yend, int ci)
   {
@@ -23539,7 +23733,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
         npregs->set.wrmask = 0xffffffff;
         npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK |
                                  NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX
-@@ -94,7 +95,7 @@
+@@ -94,7 +95,7 @@ static inline void newport_init_cmap(voi
         unsigned short i;
   
         for (i = 0; i < 16; i++) {
@@ -23548,7 +23742,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
                 newport_cmap_setaddr(npregs, color_table[i]);
                 newport_cmap_setrgb(npregs,
                                     default_red[i],
-@@ -107,7 +108,7 @@
+@@ -107,7 +108,7 @@ static inline void newport_show_logo(voi
         unsigned long i;
   
         for (i = 0; i < LINUX_LOGO_COLORS; i++) {
@@ -23557,7 +23751,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
                 newport_cmap_setaddr(npregs, i + 0x20);
                 newport_cmap_setrgb(npregs,
                                     linux_logo_red[i],
-@@ -115,13 +116,13 @@
+@@ -115,13 +116,13 @@ static inline void newport_show_logo(voi
                                     linux_logo_blue[i]);
         }
   
@@ -23573,7 +23767,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
   
         for (i = 0; i < LOGO_W * LOGO_H; i++)
                 npregs->go.hostrw0 = linux_logo[i] << 24;
-@@ -133,7 +134,7 @@
+@@ -133,7 +134,7 @@ static inline void newport_clear_screen(
         if (logo_active)
                 return;
   
@@ -23582,7 +23776,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
         npregs->set.wrmask = 0xffffffff;
         npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK |
                                  NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX
-@@ -155,7 +156,7 @@
+@@ -155,7 +156,7 @@ void newport_reset(void)
         unsigned short treg;
         int i;
   
@@ -23591,7 +23785,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
         treg = newport_vc2_get(npregs, VC2_IREG_CONTROL);
         newport_vc2_set(npregs, VC2_IREG_CONTROL,
                         (treg | VC2_CTRL_EVIDEO));
-@@ -165,7 +166,7 @@
+@@ -165,7 +166,7 @@ void newport_reset(void)
         npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM |
                                NPORT_DMODE_W2 | VC2_PROTOCOL);
         for (i = 0; i < 128; i++) {
@@ -23600,7 +23794,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
                 if (i == 92 || i == 94)
                         npregs->set.dcbdata0.byshort.s1 = 0xff00;
                 else
-@@ -205,7 +206,7 @@
+@@ -205,7 +206,7 @@ void newport_get_screensize(void)
         npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM |
                                NPORT_DMODE_W2 | VC2_PROTOCOL);
         for (i = 0; i < 128; i++) {
@@ -23609,7 +23803,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
                 linetable[i] = npregs->set.dcbdata0.byshort.s1;
         }
   
-@@ -216,12 +217,12 @@
+@@ -216,12 +217,12 @@ void newport_get_screensize(void)
                 npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM |
                                        NPORT_DMODE_W2 | VC2_PROTOCOL);
                 do {
@@ -23624,7 +23818,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
                                 treg = npregs->set.dcbdata0.byshort.s1;
                         }
                 } while ((treg & 0x8000) == 0);
-@@ -291,16 +292,16 @@
+@@ -291,16 +292,16 @@ static const char *newport_startup(void)
   
         if (!sgi_gfxaddr)
                 return NULL;
@@ -23646,7 +23840,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
   
         for (i = 0; i < MAX_NR_CONSOLES; i++)
                 font_data[i] = FONT_DATA;
-@@ -310,6 +311,10 @@
+@@ -310,6 +311,10 @@ static const char *newport_startup(void)
         newport_get_screensize();
   
         return "SGI Newport";
@@ -23657,7 +23851,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
   }
   
   static void newport_init(struct vc_data *vc, int init)
-@@ -363,7 +368,7 @@
+@@ -363,7 +368,7 @@ static void newport_putc(struct vc_data 
                                   (charattr & 0xf0) >> 4);
   
         /* Set the color and drawing mode. */
@@ -23666,7 +23860,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
         npregs->set.colori = charattr & 0xf;
         npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK |
                                  NPORT_DMODE0_STOPX | NPORT_DMODE0_ZPENAB |
-@@ -372,7 +377,7 @@
+@@ -372,7 +377,7 @@ static void newport_putc(struct vc_data 
         /* Set coordinates for bitmap operation. */
         npregs->set.xystarti = (xpos << 16) | ((ypos + topscan) & 0x3ff);
         npregs->set.xyendi = ((xpos + 7) << 16);
@@ -23675,7 +23869,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
   
         /* Go, baby, go... */
         RENDER(npregs, p);
-@@ -396,7 +401,7 @@
+@@ -396,7 +401,7 @@ static void newport_putcs(struct vc_data
                                           xpos + ((count - 1) << 3), ypos,
                                           (charattr & 0xf0) >> 4);
   
@@ -23684,7 +23878,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
   
         /* Set the color and drawing mode. */
         npregs->set.colori = charattr & 0xf;
-@@ -407,7 +412,7 @@
+@@ -407,7 +412,7 @@ static void newport_putcs(struct vc_data
         for (i = 0; i < count; i++, xpos += 8) {
                 p = &font_data[vc->vc_num][(scr_readw(s++) & 0xff) << 4];
   
@@ -23693,7 +23887,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
   
                 /* Set coordinates for bitmap operation. */
                 npregs->set.xystarti =
-@@ -689,7 +694,7 @@
+@@ -689,7 +694,7 @@ static void newport_bmove(struct vc_data
                 xe = xs;
                 xs = tmp;
         }
@@ -23702,7 +23896,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
         npregs->set.drawmode0 = (NPORT_DMODE0_S2S | NPORT_DMODE0_BLOCK |
                                  NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX
                                  | NPORT_DMODE0_STOPY);
-@@ -706,35 +711,35 @@
+@@ -706,35 +711,35 @@ static int newport_dummy(struct vc_data 
   #define DUMMY (void *) newport_dummy
   
   const struct consw newport_con = {
@@ -23755,9 +23949,10 @@ diff -Nur linux-2.4.32-rc1/drivers/video/newport_con.c linux-2.4.32-rc1.mips/dri
   }
   
   module_init(newport_console_init);
-diff -Nur linux-2.4.32-rc1/drivers/video/tgafb.c linux-2.4.32-rc1.mips/drivers/video/tgafb.c
---- linux-2.4.32-rc1/drivers/video/tgafb.c     2001-11-14 23:52:20.000000000 +0100
-+++ linux-2.4.32-rc1.mips/drivers/video/tgafb.c        2004-10-30 01:15:02.000000000 +0200
+Index: linux-2.4.35.4/drivers/video/tgafb.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/video/tgafb.c
++++ linux-2.4.35.4/drivers/video/tgafb.c
  @@ -45,6 +45,15 @@
   #include <linux/console.h>
   #include <asm/io.h>
@@ -23774,7 +23969,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/tgafb.c linux-2.4.32-rc1.mips/drivers/v
   #include <video/fbcon.h>
   #include <video/fbcon-cfb8.h>
   #include <video/fbcon-cfb32.h>
-@@ -84,10 +93,10 @@
+@@ -84,10 +93,10 @@ static unsigned int fb_offset_presets[4]
   };
   
   static unsigned int deep_presets[4] = {
@@ -23788,7 +23983,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/tgafb.c linux-2.4.32-rc1.mips/drivers/v
   };
   
   static unsigned int rasterop_presets[4] = {
-@@ -131,6 +140,13 @@
+@@ -131,6 +140,13 @@ static struct {
         0,
         FB_VMODE_NONINTERLACED
       }},
@@ -23802,7 +23997,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/tgafb.c linux-2.4.32-rc1.mips/drivers/v
       { "800x600-56", {
         800, 600, 800, 600, 0, 0, 0, 0,
         {0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0},
-@@ -488,7 +504,8 @@
+@@ -488,7 +504,8 @@ static void tgafb_set_par(const void *fb
         continue;
   
       mb();
@@ -23812,7 +24007,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/tgafb.c linux-2.4.32-rc1.mips/drivers/v
       while (TGA_READ_REG(TGA_CMD_STAT_REG) & 1) /* wait for not busy */
         continue;
       mb();
-@@ -548,7 +565,7 @@
+@@ -548,7 +565,7 @@ static void tgafb_set_par(const void *fb
         BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_0, 0x40);
         BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_1, 0x08);
         BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_2, 
@@ -23821,7 +24016,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/tgafb.c linux-2.4.32-rc1.mips/drivers/v
   
         BT463_WRITE(BT463_REG_ACC, BT463_READ_MASK_0, 0xff);
         BT463_WRITE(BT463_REG_ACC, BT463_READ_MASK_1, 0xff);
-@@ -921,19 +938,34 @@
+@@ -921,19 +938,34 @@ int __init tgafb_setup(char *options) {
   int __init tgafb_init(void)
   {
       struct pci_dev *pdev;
@@ -23861,7 +24056,7 @@ diff -Nur linux-2.4.32-rc1/drivers/video/tgafb.c linux-2.4.32-rc1.mips/drivers/v
   
       /* setup framebuffer */
   
-@@ -950,40 +982,62 @@
+@@ -950,40 +982,62 @@ int __init tgafb_init(void)
       fb_info.gen.fbhw = &tgafb_hwswitch;
       fb_info.gen.fbhw->detect();
   
@@ -23934,9 +24129,10 @@ diff -Nur linux-2.4.32-rc1/drivers/video/tgafb.c linux-2.4.32-rc1.mips/drivers/v
       return 0;
   }
   
-diff -Nur linux-2.4.32-rc1/drivers/video/tgafb.h linux-2.4.32-rc1.mips/drivers/video/tgafb.h
---- linux-2.4.32-rc1/drivers/video/tgafb.h     2000-04-12 18:47:28.000000000 +0200
-+++ linux-2.4.32-rc1.mips/drivers/video/tgafb.h        2004-10-30 01:15:02.000000000 +0200
+Index: linux-2.4.35.4/drivers/video/tgafb.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/video/tgafb.h
++++ linux-2.4.35.4/drivers/video/tgafb.h
  @@ -36,6 +36,7 @@
   #define       TGA_RASTEROP_REG                0x0034
   #define       TGA_PIXELSHIFT_REG              0x0038
@@ -23945,10 +24141,11 @@ diff -Nur linux-2.4.32-rc1/drivers/video/tgafb.h linux-2.4.32-rc1.mips/drivers/v
   #define       TGA_PIXELMASK_REG               0x005c
   #define       TGA_CURSOR_BASE_REG             0x0060
   #define       TGA_HORIZ_REG                   0x0064
-diff -Nur linux-2.4.32-rc1/fs/binfmt_elf.c linux-2.4.32-rc1.mips/fs/binfmt_elf.c
---- linux-2.4.32-rc1/fs/binfmt_elf.c   2005-06-01 02:56:56.000000000 +0200
-+++ linux-2.4.32-rc1.mips/fs/binfmt_elf.c      2005-05-23 14:12:31.000000000 +0200
-@@ -660,6 +660,9 @@
+Index: linux-2.4.35.4/fs/binfmt_elf.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/binfmt_elf.c
++++ linux-2.4.35.4/fs/binfmt_elf.c
+@@ -665,6 +665,9 @@ static int load_elf_binary(struct linux_
                     bprm->argc++;
                   }
                 }
@@ -23958,7 +24155,7 @@ diff -Nur linux-2.4.32-rc1/fs/binfmt_elf.c linux-2.4.32-rc1.mips/fs/binfmt_elf.c
         }
   
         /* Flush all traces of the currently running executable */
-@@ -1211,7 +1214,11 @@
+@@ -1225,7 +1228,11 @@ static int elf_core_dump(long signr, str
         elf.e_entry = 0;
         elf.e_phoff = sizeof(elf);
         elf.e_shoff = 0;
@@ -23970,9 +24167,10 @@ diff -Nur linux-2.4.32-rc1/fs/binfmt_elf.c linux-2.4.32-rc1.mips/fs/binfmt_elf.c
         elf.e_ehsize = sizeof(elf);
         elf.e_phentsize = sizeof(struct elf_phdr);
         elf.e_phnum = segs+1;           /* Include notes */
-diff -Nur linux-2.4.32-rc1/fs/partitions/sgi.c linux-2.4.32-rc1.mips/fs/partitions/sgi.c
---- linux-2.4.32-rc1/fs/partitions/sgi.c       2001-10-02 05:03:26.000000000 +0200
-+++ linux-2.4.32-rc1.mips/fs/partitions/sgi.c  2004-08-11 22:30:07.000000000 +0200
+Index: linux-2.4.35.4/fs/partitions/sgi.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/partitions/sgi.c
++++ linux-2.4.35.4/fs/partitions/sgi.c
  @@ -17,6 +17,11 @@
   #include "check.h"
   #include "sgi.h"
@@ -23985,7 +24183,7 @@ diff -Nur linux-2.4.32-rc1/fs/partitions/sgi.c linux-2.4.32-rc1.mips/fs/partitio
   int sgi_partition(struct gendisk *hd, struct block_device *bdev, unsigned long first_sector, int current_minor)
   {
         int i, csum, magic;
-@@ -77,6 +82,10 @@
+@@ -77,6 +82,10 @@ int sgi_partition(struct gendisk *hd, st
                 if(!blocks)
                         continue;
                 add_gd_partition(hd, current_minor, start, blocks);
@@ -23996,10 +24194,11 @@ diff -Nur linux-2.4.32-rc1/fs/partitions/sgi.c linux-2.4.32-rc1.mips/fs/partitio
                 current_minor++;
         }
         printk("\n");
-diff -Nur linux-2.4.32-rc1/fs/proc/array.c linux-2.4.32-rc1.mips/fs/proc/array.c
---- linux-2.4.32-rc1/fs/proc/array.c   2005-01-19 15:10:11.000000000 +0100
-+++ linux-2.4.32-rc1.mips/fs/proc/array.c      2004-11-29 18:47:18.000000000 +0100
-@@ -368,15 +368,15 @@
+Index: linux-2.4.35.4/fs/proc/array.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/proc/array.c
++++ linux-2.4.35.4/fs/proc/array.c
+@@ -368,15 +368,15 @@ int proc_pid_stat(struct task_struct *ta
                 task->cmin_flt,
                 task->maj_flt,
                 task->cmaj_flt,
@@ -24020,7 +24219,7 @@ diff -Nur linux-2.4.32-rc1/fs/proc/array.c linux-2.4.32-rc1.mips/fs/proc/array.c
                 vsize,
                 mm ? mm->rss : 0, /* you might want to shift this left 3 */
                 task->rlim[RLIMIT_RSS].rlim_cur,
-@@ -615,14 +615,14 @@
+@@ -615,14 +615,14 @@ int proc_pid_cpu(struct task_struct *tas
   
         len = sprintf(buffer,
                 "cpu  %lu %lu\n",
@@ -24039,10 +24238,11 @@ diff -Nur linux-2.4.32-rc1/fs/proc/array.c linux-2.4.32-rc1.mips/fs/proc/array.c
   
         return len;
   }
-diff -Nur linux-2.4.32-rc1/fs/proc/proc_misc.c linux-2.4.32-rc1.mips/fs/proc/proc_misc.c
---- linux-2.4.32-rc1/fs/proc/proc_misc.c       2004-08-08 01:26:06.000000000 +0200
-+++ linux-2.4.32-rc1.mips/fs/proc/proc_misc.c  2004-08-14 20:39:01.000000000 +0200
-@@ -308,16 +308,16 @@
+Index: linux-2.4.35.4/fs/proc/proc_misc.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/proc/proc_misc.c
++++ linux-2.4.35.4/fs/proc/proc_misc.c
+@@ -308,16 +308,16 @@ static int kstat_read_proc(char *page, c
   {
         int i, len = 0;
         extern unsigned long total_forks;
@@ -24063,7 +24263,7 @@ diff -Nur linux-2.4.32-rc1/fs/proc/proc_misc.c linux-2.4.32-rc1.mips/fs/proc/pro
   #if !defined(CONFIG_ARCH_S390)
                 for (j = 0 ; j < NR_IRQS ; j++)
                         sum += kstat.irqs[cpu][j];
-@@ -331,10 +331,10 @@
+@@ -331,10 +331,10 @@ static int kstat_read_proc(char *page, c
                 proc_sprintf(page, &off, &len,
                         "cpu%d %u %u %u %lu\n",
                         i,
@@ -24078,9 +24278,10 @@ diff -Nur linux-2.4.32-rc1/fs/proc/proc_misc.c linux-2.4.32-rc1.mips/fs/proc/pro
                                    + kstat.per_cpu_nice[cpu_logical_map(i)] \
                                    + kstat.per_cpu_system[cpu_logical_map(i)]));
         proc_sprintf(page, &off, &len,
-diff -Nur linux-2.4.32-rc1/include/asm-alpha/param.h linux-2.4.32-rc1.mips/include/asm-alpha/param.h
---- linux-2.4.32-rc1/include/asm-alpha/param.h 2000-11-08 08:37:31.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-alpha/param.h    2000-11-28 04:59:03.000000000 +0100
+Index: linux-2.4.35.4/include/asm-alpha/param.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-alpha/param.h
++++ linux-2.4.35.4/include/asm-alpha/param.h
  @@ -13,6 +13,9 @@
   # else
   #  define HZ  1200
@@ -24091,9 +24292,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-alpha/param.h linux-2.4.32-rc1.mips/inclu
   #endif
   
   #define EXEC_PAGESIZE 8192
-diff -Nur linux-2.4.32-rc1/include/asm-i386/param.h linux-2.4.32-rc1.mips/include/asm-i386/param.h
---- linux-2.4.32-rc1/include/asm-i386/param.h  2000-10-27 20:04:43.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-i386/param.h     2000-11-23 03:00:55.000000000 +0100
+Index: linux-2.4.35.4/include/asm-i386/param.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-i386/param.h
++++ linux-2.4.35.4/include/asm-i386/param.h
  @@ -3,6 +3,9 @@
   
   #ifndef HZ
@@ -24104,9 +24306,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-i386/param.h linux-2.4.32-rc1.mips/includ
   #endif
   
   #define EXEC_PAGESIZE 4096
-diff -Nur linux-2.4.32-rc1/include/asm-ia64/param.h linux-2.4.32-rc1.mips/include/asm-ia64/param.h
---- linux-2.4.32-rc1/include/asm-ia64/param.h  2004-04-14 15:05:40.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-ia64/param.h     2004-04-16 05:14:20.000000000 +0200
+Index: linux-2.4.35.4/include/asm-ia64/param.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-ia64/param.h
++++ linux-2.4.35.4/include/asm-ia64/param.h
  @@ -7,9 +7,15 @@
    * Based on <asm-i386/param.h>.
    *
@@ -24124,9 +24327,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-ia64/param.h linux-2.4.32-rc1.mips/includ
   #define EXEC_PAGESIZE 65536
   
   #ifndef NGROUPS
-diff -Nur linux-2.4.32-rc1/include/asm-m68k/param.h linux-2.4.32-rc1.mips/include/asm-m68k/param.h
---- linux-2.4.32-rc1/include/asm-m68k/param.h  2001-01-04 22:00:55.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-m68k/param.h     2001-01-11 05:02:45.000000000 +0100
+Index: linux-2.4.35.4/include/asm-m68k/param.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-m68k/param.h
++++ linux-2.4.35.4/include/asm-m68k/param.h
  @@ -3,6 +3,9 @@
   
   #ifndef HZ
@@ -24137,9 +24341,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-m68k/param.h linux-2.4.32-rc1.mips/includ
   #endif
   
   #define EXEC_PAGESIZE 8192
-diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000_gpio.h linux-2.4.32-rc1.mips/include/asm-mips/au1000_gpio.h
---- linux-2.4.32-rc1/include/asm-mips/au1000_gpio.h    2002-11-29 00:53:15.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/au1000_gpio.h       2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/au1000_gpio.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/au1000_gpio.h
++++ linux-2.4.35.4/include/asm-mips/au1000_gpio.h
  @@ -30,6 +30,13 @@
    *  675 Mass Ave, Cambridge, MA 02139, USA.
    */
@@ -24255,10 +24460,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000_gpio.h linux-2.4.32-rc1.mips/
   #endif
   
   #endif
-diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/include/asm-mips/au1000.h
---- linux-2.4.32-rc1/include/asm-mips/au1000.h 2005-01-19 15:10:11.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/au1000.h    2005-01-30 09:01:28.000000000 +0100
-@@ -160,28 +160,356 @@
+Index: linux-2.4.35.4/include/asm-mips/au1000.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/au1000.h
++++ linux-2.4.35.4/include/asm-mips/au1000.h
+@@ -160,28 +160,356 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)
   #endif
   
@@ -24633,7 +24839,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   /* Static Bus Controller */
   #define MEM_STCFG0                 0xB4001000
   #define MEM_STTIME0                0xB4001004
-@@ -367,7 +695,7 @@
+@@ -367,7 +695,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define AU1000_MAC0_ENABLE       0xB0520000
   #define AU1000_MAC1_ENABLE       0xB0520004
   #define NUM_ETH_INTERFACES 2
@@ -24642,7 +24848,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   
   /* Au1500 */
   #ifdef CONFIG_SOC_AU1500
-@@ -438,7 +766,7 @@
+@@ -438,7 +766,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define AU1500_MAC0_ENABLE       0xB1520000
   #define AU1500_MAC1_ENABLE       0xB1520004
   #define NUM_ETH_INTERFACES 2
@@ -24651,7 +24857,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   
   /* Au1100 */
   #ifdef CONFIG_SOC_AU1100
-@@ -483,6 +811,22 @@
+@@ -483,6 +811,22 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define AU1000_GPIO_13            45
   #define AU1000_GPIO_14            46
   #define AU1000_GPIO_15            47
@@ -24674,7 +24880,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   
   #define UART0_ADDR                0xB1100000
   #define UART1_ADDR                0xB1200000
-@@ -494,7 +838,7 @@
+@@ -494,7 +838,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define AU1100_ETH0_BASE        0xB0500000
   #define AU1100_MAC0_ENABLE       0xB0520000
   #define NUM_ETH_INTERFACES 1
@@ -24683,7 +24889,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   
   #ifdef CONFIG_SOC_AU1550
   #define AU1550_UART0_INT          0
-@@ -511,14 +855,14 @@
+@@ -511,14 +855,14 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define AU1550_PSC1_INT           11
   #define AU1550_PSC2_INT           12
   #define AU1550_PSC3_INT           13
@@ -24706,7 +24912,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   #define AU1550_NAND_INT           23
   #define AU1550_USB_DEV_REQ_INT    24
   #define AU1550_USB_DEV_SUS_INT    25
-@@ -573,7 +917,7 @@
+@@ -573,7 +917,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define AU1550_MAC0_ENABLE       0xB0520000
   #define AU1550_MAC1_ENABLE       0xB0520004
   #define NUM_ETH_INTERFACES 2
@@ -24715,7 +24921,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   
   #ifdef CONFIG_SOC_AU1200
   #define AU1200_UART0_INT          0
-@@ -590,14 +934,14 @@
+@@ -590,14 +934,14 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define AU1200_PSC1_INT           11
   #define AU1200_AES_INT            12
   #define AU1200_CAMERA_INT         13
@@ -24738,7 +24944,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   #define AU1200_NAND_INT           23
   #define AU1200_GPIO_204           24
   #define AU1200_GPIO_205           25
-@@ -605,6 +949,7 @@
+@@ -605,6 +949,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define AU1200_GPIO_207           27
   #define AU1200_GPIO_208_215       28 // Logical OR of 208:215
   #define AU1200_USB_INT            29
@@ -24746,7 +24952,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   #define AU1200_LCD_INT            30
   #define AU1200_MAE_BOTH_INT       31
   #define AU1000_GPIO_0             32
-@@ -643,21 +988,36 @@
+@@ -643,21 +988,36 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define UART0_ADDR                0xB1100000
   #define UART1_ADDR                0xB1200000
   
@@ -24793,7 +24999,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   /* Programmable Counters 0 and 1 */
   #define SYS_BASE                   0xB1900000
   #define SYS_COUNTER_CNTRL          (SYS_BASE + 0x14)
-@@ -728,6 +1088,8 @@
+@@ -728,6 +1088,8 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
     #define I2S_CONTROL_D         (1<<1)
     #define I2S_CONTROL_CE        (1<<0)
   
@@ -24802,7 +25008,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   /* USB Host Controller */
   #define USB_OHCI_LEN              0x00100000
   
-@@ -773,6 +1135,8 @@
+@@ -773,6 +1135,8 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
     #define USBDEV_ENABLE (1<<1)
     #define USBDEV_CE     (1<<0)
   
@@ -24811,7 +25017,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   /* Ethernet Controllers  */
   
   /* 4 byte offsets from AU1000_ETH_BASE */
-@@ -1171,6 +1535,37 @@
+@@ -1171,6 +1535,37 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
     #define SYS_PF_PSC1_S1              (1 << 1)
     #define SYS_PF_MUST_BE_SET          ((1 << 5) | (1 << 2))
   
@@ -24849,7 +25055,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   #define SYS_TRIOUTRD              0xB1900100
   #define SYS_TRIOUTCLR             0xB1900100
   #define SYS_OUTPUTRD              0xB1900108
-@@ -1298,7 +1693,6 @@
+@@ -1298,7 +1693,6 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   #define SD1_XMIT_FIFO 0xB0680000
   #define SD1_RECV_FIFO 0xB0680004
   
@@ -24857,7 +25063,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   #if defined (CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550)
   /* Au1500 PCI Controller */
   #define Au1500_CFG_BASE           0xB4005000 // virtual, kseg0 addr
-@@ -1388,9 +1782,60 @@
+@@ -1388,9 +1782,60 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
   
   #endif
   
@@ -24918,16 +25124,17 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
   struct cpu_spec {
         /* CPU is matched via (PRID & prid_mask) == prid_value */
         unsigned int    prid_mask;
-@@ -1404,3 +1849,6 @@
+@@ -1404,3 +1849,6 @@ struct cpu_spec {
   extern struct cpu_spec                cpu_specs[];
   extern struct cpu_spec                *cur_cpu_spec[];
   #endif
  +
  +#endif
  +
-diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000_pcmcia.h linux-2.4.32-rc1.mips/include/asm-mips/au1000_pcmcia.h
---- linux-2.4.32-rc1/include/asm-mips/au1000_pcmcia.h  2005-01-19 15:10:11.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/au1000_pcmcia.h     2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/au1000_pcmcia.h
++++ linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h
  @@ -38,16 +38,41 @@
   #define AU1X_SOCK0_PHYS_MEM  0xF80000000
   
@@ -24979,9 +25186,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000_pcmcia.h linux-2.4.32-rc1.mip
   #endif
   
   struct pcmcia_state {
-diff -Nur linux-2.4.32-rc1/include/asm-mips/au1100_mmc.h linux-2.4.32-rc1.mips/include/asm-mips/au1100_mmc.h
---- linux-2.4.32-rc1/include/asm-mips/au1100_mmc.h     2005-01-19 15:10:11.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/au1100_mmc.h        2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/au1100_mmc.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/au1100_mmc.h
++++ linux-2.4.35.4/include/asm-mips/au1100_mmc.h
  @@ -39,16 +39,22 @@
   #define __ASM_AU1100_MMC_H
   
@@ -25023,9 +25231,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1100_mmc.h linux-2.4.32-rc1.mips/i
  +
   #endif /* __ASM_AU1100_MMC_H */
   
-diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips/include/asm-mips/au1xxx_dbdma.h
---- linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h   2005-01-19 15:10:11.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/au1xxx_dbdma.h      2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/au1xxx_dbdma.h
++++ linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h
  @@ -43,7 +43,7 @@
   #define DDMA_GLOBAL_BASE      0xb4003000
   #define DDMA_CHANNEL_BASE     0xb4002000
@@ -25035,7 +25244,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips
         u32     ddma_config;
         u32     ddma_intstat;
         u32     ddma_throttle;
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ typedef struct dbdma_global {
   
   /* The structure of a DMA Channel.
   */
@@ -25044,7 +25253,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips
         u32     ddma_cfg;       /* See below */
         u32     ddma_desptr;    /* 32-byte aligned pointer to descriptor */
         u32     ddma_statptr;   /* word aligned pointer to status word */
-@@ -96,7 +96,7 @@
+@@ -96,7 +96,7 @@ typedef struct au1xxx_dma_channel {
   /* "Standard" DDMA Descriptor.
    * Must be 32-byte aligned.
    */
@@ -25053,7 +25262,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips
         u32     dscr_cmd0;              /* See below */
         u32     dscr_cmd1;              /* See below */
         u32     dscr_source0;           /* source phys address */
-@@ -105,6 +105,12 @@
+@@ -105,6 +105,12 @@ typedef struct au1xxx_ddma_desc {
         u32     dscr_dest1;             /* See below */
         u32     dscr_stat;              /* completion status */
         u32     dscr_nxtptr;            /* Next descriptor pointer (mostly) */
@@ -25066,7 +25275,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips
   } au1x_ddma_desc_t;
   
   #define DSCR_CMD0_V           (1 << 31)       /* Descriptor valid */
-@@ -123,6 +129,8 @@
+@@ -123,6 +129,8 @@ typedef struct au1xxx_ddma_desc {
   #define DSCR_CMD0_CV          (0x1 << 2)      /* Clear Valid when done */
   #define DSCR_CMD0_ST_MASK     (0x3 << 0)      /* Status instruction */
   
@@ -25075,7 +25284,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips
   /* Command 0 device IDs.
   */
   #ifdef CONFIG_SOC_AU1550
-@@ -169,8 +177,8 @@
+@@ -169,8 +177,8 @@ typedef struct au1xxx_ddma_desc {
   #define DSCR_CMD0_SDMS_RX0    9
   #define DSCR_CMD0_SDMS_TX1    10
   #define DSCR_CMD0_SDMS_RX1    11
@@ -25086,7 +25295,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips
   #define DSCR_CMD0_PSC0_TX     14
   #define DSCR_CMD0_PSC0_RX     15
   #define DSCR_CMD0_PSC1_TX     16
-@@ -189,6 +197,10 @@
+@@ -189,6 +197,10 @@ typedef struct au1xxx_ddma_desc {
   #define DSCR_CMD0_THROTTLE    30
   #define DSCR_CMD0_ALWAYS      31
   #define DSCR_NDEV_IDS         32
@@ -25097,7 +25306,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips
   
   #define DSCR_CMD0_SID(x)      (((x) & 0x1f) << 25)
   #define DSCR_CMD0_DID(x)      (((x) & 0x1f) << 20)
-@@ -277,6 +289,43 @@
+@@ -277,6 +289,43 @@ typedef struct au1xxx_ddma_desc {
   */
   #define NUM_DBDMA_CHANS       16
   
@@ -25141,7 +25350,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips
   /* External functions for drivers to use.
   */
   /* Use this to allocate a dbdma channel.  The device ids are one of the
-@@ -299,8 +348,8 @@
+@@ -299,8 +348,8 @@ u32 au1xxx_dbdma_ring_alloc(u32 chanid, 
   
   /* Put buffers on source/destination descriptors.
   */
@@ -25152,7 +25361,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips
   
   /* Get a buffer from the destination descriptor.
   */
-@@ -314,5 +363,25 @@
+@@ -314,5 +363,25 @@ u32 au1xxx_get_dma_residue(u32 chanid);
   void au1xxx_dbdma_chan_free(u32 chanid);
   void au1xxx_dbdma_dump(u32 chanid);
   
@@ -25178,9 +25387,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_dbdma.h linux-2.4.32-rc1.mips
  +
   #endif /* _LANGUAGE_ASSEMBLY */
   #endif /* _AU1000_DBDMA_H_ */
-diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_gpio.h linux-2.4.32-rc1.mips/include/asm-mips/au1xxx_gpio.h
---- linux-2.4.32-rc1/include/asm-mips/au1xxx_gpio.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/au1xxx_gpio.h       2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h
  @@ -0,0 +1,22 @@
  +
  +
@@ -25204,9 +25414,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_gpio.h linux-2.4.32-rc1.mips/
  +} AU1X00_GPIO2;
  +
  +#endif //__AU1XXX_GPIO_H
-diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_psc.h linux-2.4.32-rc1.mips/include/asm-mips/au1xxx_psc.h
---- linux-2.4.32-rc1/include/asm-mips/au1xxx_psc.h     2005-01-19 15:10:11.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/au1xxx_psc.h        2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/au1xxx_psc.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/au1xxx_psc.h
++++ linux-2.4.35.4/include/asm-mips/au1xxx_psc.h
  @@ -41,6 +41,11 @@
   #define PSC3_BASE_ADDR                0xb0d00000
   #endif
@@ -25219,7 +25430,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_psc.h linux-2.4.32-rc1.mips/i
   /* The PSC select and control registers are common to
    * all protocols.
    */
-@@ -226,6 +231,8 @@
+@@ -226,6 +231,8 @@ typedef struct     psc_i2s {
   #define PSC_I2SCFG_DD_DISABLE (1 << 27)
   #define PSC_I2SCFG_DE_ENABLE  (1 << 26)
   #define PSC_I2SCFG_SET_WS(x)  (((((x) / 2) - 1) & 0x7f) << 16)
@@ -25228,9 +25439,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1xxx_psc.h linux-2.4.32-rc1.mips/i
   #define PSC_I2SCFG_WI         (1 << 15)
   
   #define PSC_I2SCFG_DIV_MASK   (3 << 13)
-diff -Nur linux-2.4.32-rc1/include/asm-mips/bootinfo.h linux-2.4.32-rc1.mips/include/asm-mips/bootinfo.h
---- linux-2.4.32-rc1/include/asm-mips/bootinfo.h       2004-02-18 14:36:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/bootinfo.h  2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/bootinfo.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/bootinfo.h
++++ linux-2.4.35.4/include/asm-mips/bootinfo.h
  @@ -180,6 +180,9 @@
   #define MACH_MTX1             7       /* 4G MTX-1 Au1500-based board */
   #define MACH_CSB250           8       /* Cogent Au1500 */
@@ -25241,9 +25453,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/bootinfo.h linux-2.4.32-rc1.mips/inc
   
   /*
    * Valid machtype for group NEC_VR41XX
-diff -Nur linux-2.4.32-rc1/include/asm-mips/db1200.h linux-2.4.32-rc1.mips/include/asm-mips/db1200.h
---- linux-2.4.32-rc1/include/asm-mips/db1200.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/db1200.h    2005-01-30 09:02:45.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/db1200.h
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/include/asm-mips/db1200.h
  @@ -0,0 +1,214 @@
  +/*
  + * AMD Alchemy DB1200 Referrence Board
@@ -25459,9 +25672,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/db1200.h linux-2.4.32-rc1.mips/inclu
  +
  +#endif /* __ASM_DB1200_H */
  +
-diff -Nur linux-2.4.32-rc1/include/asm-mips/db1x00.h linux-2.4.32-rc1.mips/include/asm-mips/db1x00.h
---- linux-2.4.32-rc1/include/asm-mips/db1x00.h 2005-01-19 15:10:11.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/db1x00.h    2005-01-30 09:06:19.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/db1x00.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/db1x00.h
++++ linux-2.4.35.4/include/asm-mips/db1x00.h
  @@ -1,5 +1,5 @@
   /*
  - * AMD Alchemy DB1x00 Reference Boards
@@ -25488,7 +25702,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/db1x00.h linux-2.4.32-rc1.mips/inclu
   #endif
   
   /*
-@@ -66,6 +75,7 @@
+@@ -66,6 +75,7 @@ typedef volatile struct
   
   } BCSR;
   
@@ -25496,7 +25710,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/db1x00.h linux-2.4.32-rc1.mips/inclu
   
   /*
    * Register/mask bit definitions for the BCSRs
-@@ -130,14 +140,6 @@
+@@ -130,14 +140,6 @@ typedef volatile struct
   
   #define BCSR_SWRESET_RESET            0x0080
   
@@ -25511,7 +25725,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/db1x00.h linux-2.4.32-rc1.mips/inclu
   /* MTD CONFIG OPTIONS */
   #if defined(CONFIG_MTD_DB1X00_BOOT) && defined(CONFIG_MTD_DB1X00_USER)
   #define DB1X00_BOTH_BANKS
-@@ -147,48 +149,15 @@
+@@ -147,48 +149,15 @@ typedef volatile struct
   #define DB1X00_USER_ONLY
   #endif
   
@@ -25567,10 +25781,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/db1x00.h linux-2.4.32-rc1.mips/inclu
   
   #endif /* __ASM_DB1X00_H */
   
-diff -Nur linux-2.4.32-rc1/include/asm-mips/elf.h linux-2.4.32-rc1.mips/include/asm-mips/elf.h
---- linux-2.4.32-rc1/include/asm-mips/elf.h    2004-02-18 14:36:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/elf.h       2005-04-14 12:41:44.000000000 +0200
-@@ -66,9 +66,10 @@
+Index: linux-2.4.35.4/include/asm-mips/elf.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/elf.h
++++ linux-2.4.35.4/include/asm-mips/elf.h
+@@ -66,9 +66,10 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
   #define USE_ELF_CORE_DUMP
   #define ELF_EXEC_PAGESIZE     PAGE_SIZE
   
@@ -25584,9 +25799,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/elf.h linux-2.4.32-rc1.mips/include/
   
   /* This yields a mask that user programs can use to figure out what
      instruction set this cpu supports.  This could be done in userspace,
-diff -Nur linux-2.4.32-rc1/include/asm-mips/ficmmp.h linux-2.4.32-rc1.mips/include/asm-mips/ficmmp.h
---- linux-2.4.32-rc1/include/asm-mips/ficmmp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/ficmmp.h    2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/ficmmp.h
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/include/asm-mips/ficmmp.h
  @@ -0,0 +1,156 @@
  +/*
  + * FIC MMP
@@ -25744,9 +25960,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/ficmmp.h linux-2.4.32-rc1.mips/inclu
  +
  +#endif /* __ASM_FICMMP_H */
  +
-diff -Nur linux-2.4.32-rc1/include/asm-mips/hazards.h linux-2.4.32-rc1.mips/include/asm-mips/hazards.h
---- linux-2.4.32-rc1/include/asm-mips/hazards.h        2004-02-18 14:36:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/hazards.h   2005-06-06 16:46:22.000000000 +0200
+Index: linux-2.4.35.4/include/asm-mips/hazards.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/hazards.h
++++ linux-2.4.35.4/include/asm-mips/hazards.h
  @@ -3,7 +3,7 @@
    * License.  See the file "COPYING" in the main directory of this archive
    * for more details.
@@ -25963,10 +26180,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/hazards.h linux-2.4.32-rc1.mips/incl
  +#endif /* __ASSEMBLY__ */
  +
   #endif /* _ASM_HAZARDS_H */
-diff -Nur linux-2.4.32-rc1/include/asm-mips/ide.h linux-2.4.32-rc1.mips/include/asm-mips/ide.h
---- linux-2.4.32-rc1/include/asm-mips/ide.h    2003-08-25 13:44:43.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-mips/ide.h       2005-04-19 14:26:53.000000000 +0200
-@@ -32,12 +32,12 @@
+Index: linux-2.4.35.4/include/asm-mips/ide.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/ide.h
++++ linux-2.4.35.4/include/asm-mips/ide.h
+@@ -32,12 +32,12 @@ struct ide_ops {
   
   extern struct ide_ops *ide_ops;
   
@@ -25981,7 +26199,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/ide.h linux-2.4.32-rc1.mips/include/
   {
         return ide_ops->ide_default_io_base(index);
   }
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ static inline void ide_init_hwif_ports(h
         ide_ops->ide_init_hwif_ports(hw, data_port, ctrl_port, irq);
   }
   
@@ -25990,7 +26208,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/ide.h linux-2.4.32-rc1.mips/include/
   {
   #ifndef CONFIG_BLK_DEV_IDEPCI
         hw_regs_t hw;
-@@ -68,7 +68,89 @@
+@@ -68,7 +68,89 @@ static __inline__ void ide_init_default_
   #define ide_ack_intr(hwif)    ((hwif)->hw.ack_intr ? (hwif)->hw.ack_intr(hwif) : 1)
   #endif
   
@@ -26081,10 +26299,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/ide.h linux-2.4.32-rc1.mips/include/
   
   #endif /* __KERNEL__ */
   
-diff -Nur linux-2.4.32-rc1/include/asm-mips/io.h linux-2.4.32-rc1.mips/include/asm-mips/io.h
---- linux-2.4.32-rc1/include/asm-mips/io.h     2003-08-25 13:44:43.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-mips/io.h        2005-04-19 14:24:16.000000000 +0200
-@@ -392,7 +392,8 @@
+Index: linux-2.4.35.4/include/asm-mips/io.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/io.h
++++ linux-2.4.35.4/include/asm-mips/io.h
+@@ -392,7 +392,8 @@ static inline unsigned int inl_p(unsigne
         return __ioswab32(__val);
   }
   
@@ -26094,7 +26313,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/io.h linux-2.4.32-rc1.mips/include/a
   {
         while (count--) {
                 outb(*(u8 *)addr, port);
-@@ -408,7 +409,8 @@
+@@ -408,7 +409,8 @@ static inline void __insb(unsigned long 
         }
   }
   
@@ -26104,7 +26323,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/io.h linux-2.4.32-rc1.mips/include/a
   {
         while (count--) {
                 outw(*(u16 *)addr, port);
-@@ -424,7 +426,8 @@
+@@ -424,7 +426,8 @@ static inline void __insw(unsigned long 
         }
   }
   
@@ -26114,10 +26333,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/io.h linux-2.4.32-rc1.mips/include/a
   {
         while (count--) {
                 outl(*(u32 *)addr, port);
-diff -Nur linux-2.4.32-rc1/include/asm-mips/mipsregs.h linux-2.4.32-rc1.mips/include/asm-mips/mipsregs.h
---- linux-2.4.32-rc1/include/asm-mips/mipsregs.h       2005-01-19 15:10:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/mipsregs.h  2005-02-06 22:24:22.000000000 +0100
-@@ -757,10 +757,18 @@
+Index: linux-2.4.35.4/include/asm-mips/mipsregs.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/mipsregs.h
++++ linux-2.4.35.4/include/asm-mips/mipsregs.h
+@@ -757,10 +757,18 @@ do {                                                                     \
   #define read_c0_config1()     __read_32bit_c0_register($16, 1)
   #define read_c0_config2()     __read_32bit_c0_register($16, 2)
   #define read_c0_config3()     __read_32bit_c0_register($16, 3)
@@ -26136,7 +26356,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/mipsregs.h linux-2.4.32-rc1.mips/inc
   
   /*
    * The WatchLo register.  There may be upto 8 of them.
-@@ -874,42 +882,34 @@
+@@ -874,42 +882,34 @@ do {                                                                     \
    */
   static inline void tlb_probe(void)
   {
@@ -26179,9 +26399,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/mipsregs.h linux-2.4.32-rc1.mips/inc
   }
   
   /*
-diff -Nur linux-2.4.32-rc1/include/asm-mips/mmu_context.h linux-2.4.32-rc1.mips/include/asm-mips/mmu_context.h
---- linux-2.4.32-rc1/include/asm-mips/mmu_context.h    2005-01-19 15:10:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/mmu_context.h       2004-11-22 14:38:29.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/mmu_context.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/mmu_context.h
++++ linux-2.4.35.4/include/asm-mips/mmu_context.h
  @@ -27,7 +27,7 @@
   #define TLBMISS_HANDLER_SETUP_PGD(pgd) \
         pgd_current[smp_processor_id()] = (unsigned long)(pgd)
@@ -26191,9 +26412,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/mmu_context.h linux-2.4.32-rc1.mips/
         TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
   extern unsigned long pgd_current[];
   
-diff -Nur linux-2.4.32-rc1/include/asm-mips/pb1100.h linux-2.4.32-rc1.mips/include/asm-mips/pb1100.h
---- linux-2.4.32-rc1/include/asm-mips/pb1100.h 2003-08-25 13:44:44.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-mips/pb1100.h    2005-01-30 09:10:29.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/pb1100.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/pb1100.h
++++ linux-2.4.35.4/include/asm-mips/pb1100.h
  @@ -1,5 +1,5 @@
   /*
  - * Alchemy Semi PB1100 Referrence Board
@@ -26360,9 +26582,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/pb1100.h linux-2.4.32-rc1.mips/inclu
   
   #endif /* __ASM_PB1100_H */
  +
-diff -Nur linux-2.4.32-rc1/include/asm-mips/pb1200.h linux-2.4.32-rc1.mips/include/asm-mips/pb1200.h
---- linux-2.4.32-rc1/include/asm-mips/pb1200.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/pb1200.h    2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/pb1200.h
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/include/asm-mips/pb1200.h
  @@ -0,0 +1,244 @@
  +/*
  + * AMD Alchemy PB1200 Referrence Board
@@ -26608,9 +26831,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/pb1200.h linux-2.4.32-rc1.mips/inclu
  +
  +#endif /* __ASM_PB1200_H */
  +
-diff -Nur linux-2.4.32-rc1/include/asm-mips/pb1550.h linux-2.4.32-rc1.mips/include/asm-mips/pb1550.h
---- linux-2.4.32-rc1/include/asm-mips/pb1550.h 2005-01-19 15:10:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/pb1550.h    2005-01-30 09:01:28.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/pb1550.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/pb1550.h
++++ linux-2.4.35.4/include/asm-mips/pb1550.h
  @@ -30,13 +30,11 @@
   
   #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX
@@ -26626,7 +26850,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/pb1550.h linux-2.4.32-rc1.mips/inclu
   
   #define BCSR_PHYS_ADDR 0xAF000000
   
-@@ -160,9 +158,23 @@
+@@ -160,9 +158,23 @@ static BCSR * const bcsr = (BCSR *)BCSR_
   #define NAND_T_SU_SHIFT               8
   #define NAND_T_WH_SHIFT               12
   
@@ -26654,9 +26878,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/pb1550.h linux-2.4.32-rc1.mips/inclu
  +#define AU1XXX_SMC91111_IRQ           AU1000_GPIO_3
   
   #endif /* __ASM_PB1550_H */
-diff -Nur linux-2.4.32-rc1/include/asm-mips/reg.h linux-2.4.32-rc1.mips/include/asm-mips/reg.h
---- linux-2.4.32-rc1/include/asm-mips/reg.h    2002-08-03 02:39:45.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-mips/reg.h       2005-04-14 12:41:44.000000000 +0200
+Index: linux-2.4.35.4/include/asm-mips/reg.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/reg.h
++++ linux-2.4.35.4/include/asm-mips/reg.h
  @@ -45,6 +45,9 @@
   /*
    * k0/k1 unsaved
@@ -26675,10 +26900,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/reg.h linux-2.4.32-rc1.mips/include/
   
   #define EF_SIZE                       180     /* size in bytes */
   
-diff -Nur linux-2.4.32-rc1/include/asm-mips/sgi/hpc3.h linux-2.4.32-rc1.mips/include/asm-mips/sgi/hpc3.h
---- linux-2.4.32-rc1/include/asm-mips/sgi/hpc3.h       2003-08-25 13:44:44.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-mips/sgi/hpc3.h  2005-09-23 16:35:27.000000000 +0200
-@@ -128,26 +128,26 @@
+Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/sgi/hpc3.h
++++ linux-2.4.35.4/include/asm-mips/sgi/hpc3.h
+@@ -128,26 +128,26 @@ struct hpc3_ethregs {
         volatile u32 rx_gfptr;  /* current GIO fifo ptr */
         volatile u32 rx_dfptr;  /* current device fifo ptr */
         u32 _unused1;           /* padding */
@@ -26725,7 +26951,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/sgi/hpc3.h linux-2.4.32-rc1.mips/inc
   
         u32 _unused2[0x1000/4 - 8];     /* padding */
   
-@@ -221,7 +221,7 @@
+@@ -221,7 +221,7 @@ struct hpc3_regs {
   #define HPC3_BESTAT_PIDMASK   0x3f700 /* DMA channel parity identifier */
   
         u32 _unused1[0x14000/4 - 5];    /* padding */
@@ -26734,7 +26960,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/sgi/hpc3.h linux-2.4.32-rc1.mips/inc
         /* Now direct PIO per-HPC3 peripheral access to external regs. */
         volatile u32 scsi0_ext[256];    /* SCSI channel 0 external regs */
         u32 _unused2[0x7c00/4];
-@@ -304,7 +304,7 @@
+@@ -304,7 +304,7 @@ struct hpc3_regs {
         volatile u32 bbram[8192-50-14]; /* Battery backed ram */
   };
   
@@ -26743,9 +26969,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/sgi/hpc3.h linux-2.4.32-rc1.mips/inc
    * It is possible to have two HPC3's within the address space on
    * one machine, though only having one is more likely on an Indy.
    */
-diff -Nur linux-2.4.32-rc1/include/asm-mips/tx4927/tx4927.h linux-2.4.32-rc1.mips/include/asm-mips/tx4927/tx4927.h
---- linux-2.4.32-rc1/include/asm-mips/tx4927/tx4927.h  2003-08-25 13:44:44.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-mips/tx4927/tx4927.h     2004-11-22 19:02:10.000000000 +0100
+Index: linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/tx4927/tx4927.h
++++ linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h
  @@ -88,8 +88,8 @@
   
   
@@ -26814,10 +27041,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/tx4927/tx4927.h linux-2.4.32-rc1.mip
   #define TX4927_ACLC_ACSEMAPH            0xf720
   #define TX4927_ACLC_ACGPIDAT            0xf740
   #define TX4927_ACLC_ACGPODAT            0xf744
-diff -Nur linux-2.4.32-rc1/include/asm-mips/unistd.h linux-2.4.32-rc1.mips/include/asm-mips/unistd.h
---- linux-2.4.32-rc1/include/asm-mips/unistd.h 2005-01-19 15:10:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips/unistd.h    2004-11-24 21:30:06.000000000 +0100
-@@ -760,7 +760,7 @@
+Index: linux-2.4.35.4/include/asm-mips/unistd.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/unistd.h
++++ linux-2.4.35.4/include/asm-mips/unistd.h
+@@ -760,7 +760,7 @@ type name(void) \
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -26826,7 +27054,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/unistd.h linux-2.4.32-rc1.mips/inclu
   }
   
   /*
-@@ -788,7 +788,7 @@
+@@ -788,7 +788,7 @@ type name(atype a) \
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -26835,7 +27063,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/unistd.h linux-2.4.32-rc1.mips/inclu
   }
   
   #define _syscall2(type,name,atype,a,btype,b) \
-@@ -813,7 +813,7 @@
+@@ -813,7 +813,7 @@ type name(atype a, btype b) \
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -26844,7 +27072,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/unistd.h linux-2.4.32-rc1.mips/inclu
   }
   
   #define _syscall3(type,name,atype,a,btype,b,ctype,c) \
-@@ -839,7 +839,7 @@
+@@ -839,7 +839,7 @@ type name(atype a, btype b, ctype c) \
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -26853,7 +27081,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/unistd.h linux-2.4.32-rc1.mips/inclu
   }
   
   #define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \
-@@ -865,7 +865,7 @@
+@@ -865,7 +865,7 @@ type name(atype a, btype b, ctype c, dty
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -26862,7 +27090,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/unistd.h linux-2.4.32-rc1.mips/inclu
   }
   
   #if (_MIPS_SIM == _MIPS_SIM_ABI32)
-@@ -902,7 +902,7 @@
+@@ -902,7 +902,7 @@ type name(atype a, btype b, ctype c, dty
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -26871,7 +27099,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/unistd.h linux-2.4.32-rc1.mips/inclu
   }
   
   #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \
-@@ -935,7 +935,7 @@
+@@ -935,7 +935,7 @@ type name(atype a, btype b, ctype c, dty
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -26880,7 +27108,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/unistd.h linux-2.4.32-rc1.mips/inclu
   }
   
   #endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */
-@@ -966,7 +966,7 @@
+@@ -966,7 +966,7 @@ type name (atype a,btype b,ctype c,dtype
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -26889,7 +27117,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/unistd.h linux-2.4.32-rc1.mips/inclu
   }
   
   #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \
-@@ -995,7 +995,7 @@
+@@ -995,7 +995,7 @@ type name (atype a,btype b,ctype c,dtype
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -26898,10 +27126,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/unistd.h linux-2.4.32-rc1.mips/inclu
   }
   
   #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-diff -Nur linux-2.4.32-rc1/include/asm-mips64/checksum.h linux-2.4.32-rc1.mips/include/asm-mips64/checksum.h
---- linux-2.4.32-rc1/include/asm-mips64/checksum.h     2005-01-19 15:10:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips64/checksum.h        2005-09-20 12:58:50.000000000 +0200
-@@ -144,7 +144,7 @@
+Index: linux-2.4.35.4/include/asm-mips64/checksum.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/checksum.h
++++ linux-2.4.35.4/include/asm-mips64/checksum.h
+@@ -144,7 +144,7 @@ static inline unsigned long csum_tcpudp_
         "daddu\t%0, %4\n\t"
         "dsll32\t$1, %0, 0\n\t"
         "daddu\t%0, $1\n\t"
@@ -26910,10 +27139,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/checksum.h linux-2.4.32-rc1.mips/i
         ".set\tat"
         : "=&r" (sum)
         : "0" (daddr), "r"(saddr),
-diff -Nur linux-2.4.32-rc1/include/asm-mips64/elf.h linux-2.4.32-rc1.mips/include/asm-mips64/elf.h
---- linux-2.4.32-rc1/include/asm-mips64/elf.h  2004-02-18 14:36:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips64/elf.h     2005-04-14 12:41:44.000000000 +0200
-@@ -64,9 +64,10 @@
+Index: linux-2.4.35.4/include/asm-mips64/elf.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/elf.h
++++ linux-2.4.35.4/include/asm-mips64/elf.h
+@@ -64,9 +64,10 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
   #define USE_ELF_CORE_DUMP
   #define ELF_EXEC_PAGESIZE     PAGE_SIZE
   
@@ -26927,9 +27157,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/elf.h linux-2.4.32-rc1.mips/includ
   
   /* This yields a mask that user programs can use to figure out what
      instruction set this cpu supports.  This could be done in userspace,
-diff -Nur linux-2.4.32-rc1/include/asm-mips64/hazards.h linux-2.4.32-rc1.mips/include/asm-mips64/hazards.h
---- linux-2.4.32-rc1/include/asm-mips64/hazards.h      2004-02-18 14:36:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips64/hazards.h 2005-06-06 16:46:22.000000000 +0200
+Index: linux-2.4.35.4/include/asm-mips64/hazards.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/hazards.h
++++ linux-2.4.35.4/include/asm-mips64/hazards.h
  @@ -3,7 +3,7 @@
    * License.  See the file "COPYING" in the main directory of this archive
    * for more details.
@@ -27147,10 +27378,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/hazards.h linux-2.4.32-rc1.mips/in
  +#endif /* __ASSEMBLY__ */
  +
   #endif /* _ASM_HAZARDS_H */
-diff -Nur linux-2.4.32-rc1/include/asm-mips64/ide.h linux-2.4.32-rc1.mips/include/asm-mips64/ide.h
---- linux-2.4.32-rc1/include/asm-mips64/ide.h  2003-08-25 13:44:44.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-mips64/ide.h     2005-04-19 14:26:53.000000000 +0200
-@@ -32,12 +32,12 @@
+Index: linux-2.4.35.4/include/asm-mips64/ide.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/ide.h
++++ linux-2.4.35.4/include/asm-mips64/ide.h
+@@ -32,12 +32,12 @@ struct ide_ops {
   
   extern struct ide_ops *ide_ops;
   
@@ -27165,7 +27397,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/ide.h linux-2.4.32-rc1.mips/includ
   {
         return ide_ops->ide_default_io_base(index);
   }
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ static inline void ide_init_hwif_ports(h
         ide_ops->ide_init_hwif_ports(hw, data_port, ctrl_port, irq);
   }
   
@@ -27174,7 +27406,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/ide.h linux-2.4.32-rc1.mips/includ
   {
   #ifndef CONFIG_BLK_DEV_IDEPCI
         hw_regs_t hw;
-@@ -68,7 +68,89 @@
+@@ -68,7 +68,89 @@ static __inline__ void ide_init_default_
   #define ide_ack_intr(hwif)    ((hwif)->hw.ack_intr ? (hwif)->hw.ack_intr(hwif) : 1)
   #endif
   
@@ -27265,10 +27497,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/ide.h linux-2.4.32-rc1.mips/includ
   
   #endif /* __KERNEL__ */
   
-diff -Nur linux-2.4.32-rc1/include/asm-mips64/io.h linux-2.4.32-rc1.mips/include/asm-mips64/io.h
---- linux-2.4.32-rc1/include/asm-mips64/io.h   2004-02-18 14:36:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips64/io.h      2005-04-19 14:24:53.000000000 +0200
-@@ -414,7 +414,8 @@
+Index: linux-2.4.35.4/include/asm-mips64/io.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/io.h
++++ linux-2.4.35.4/include/asm-mips64/io.h
+@@ -414,7 +414,8 @@ static inline unsigned int inl_p(unsigne
         return __ioswab32(__val);
   }
   
@@ -27278,7 +27511,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/io.h linux-2.4.32-rc1.mips/include
   {
         while (count--) {
                 outb(*(u8 *)addr, port);
-@@ -430,7 +431,8 @@
+@@ -430,7 +431,8 @@ static inline void __insb(unsigned long 
         }
   }
   
@@ -27288,7 +27521,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/io.h linux-2.4.32-rc1.mips/include
   {
         while (count--) {
                 outw(*(u16 *)addr, port);
-@@ -446,7 +448,8 @@
+@@ -446,7 +448,8 @@ static inline void __insw(unsigned long 
         }
   }
   
@@ -27298,10 +27531,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/io.h linux-2.4.32-rc1.mips/include
   {
         while (count--) {
                 outl(*(u32 *)addr, port);
-diff -Nur linux-2.4.32-rc1/include/asm-mips64/mipsregs.h linux-2.4.32-rc1.mips/include/asm-mips64/mipsregs.h
---- linux-2.4.32-rc1/include/asm-mips64/mipsregs.h     2005-01-19 15:10:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips64/mipsregs.h        2005-02-06 22:24:22.000000000 +0100
-@@ -757,10 +757,18 @@
+Index: linux-2.4.35.4/include/asm-mips64/mipsregs.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/mipsregs.h
++++ linux-2.4.35.4/include/asm-mips64/mipsregs.h
+@@ -757,10 +757,18 @@ do {                                                                     \
   #define read_c0_config1()     __read_32bit_c0_register($16, 1)
   #define read_c0_config2()     __read_32bit_c0_register($16, 2)
   #define read_c0_config3()     __read_32bit_c0_register($16, 3)
@@ -27320,7 +27554,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/mipsregs.h linux-2.4.32-rc1.mips/i
   
   /*
    * The WatchLo register.  There may be upto 8 of them.
-@@ -856,42 +864,34 @@
+@@ -856,42 +864,34 @@ do {                                                                     \
    */
   static inline void tlb_probe(void)
   {
@@ -27363,9 +27597,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/mipsregs.h linux-2.4.32-rc1.mips/i
   }
   
   /*
-diff -Nur linux-2.4.32-rc1/include/asm-mips64/reg.h linux-2.4.32-rc1.mips/include/asm-mips64/reg.h
---- linux-2.4.32-rc1/include/asm-mips64/reg.h  2003-08-25 13:44:44.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-mips64/reg.h     2005-04-14 12:41:44.000000000 +0200
+Index: linux-2.4.35.4/include/asm-mips64/reg.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/reg.h
++++ linux-2.4.35.4/include/asm-mips64/reg.h
  @@ -46,6 +46,9 @@
   /*
    * k0/k1 unsaved
@@ -27376,10 +27611,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/reg.h linux-2.4.32-rc1.mips/includ
   #define EF_REG28              28
   #define EF_REG29              29
   #define EF_REG30              30
-diff -Nur linux-2.4.32-rc1/include/asm-mips64/sgi/hpc3.h linux-2.4.32-rc1.mips/include/asm-mips64/sgi/hpc3.h
---- linux-2.4.32-rc1/include/asm-mips64/sgi/hpc3.h     2003-08-25 13:44:44.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-mips64/sgi/hpc3.h        2005-09-23 16:35:27.000000000 +0200
-@@ -128,26 +128,26 @@
+Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/sgi/hpc3.h
++++ linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h
+@@ -128,26 +128,26 @@ struct hpc3_ethregs {
         volatile u32 rx_gfptr;  /* current GIO fifo ptr */
         volatile u32 rx_dfptr;  /* current device fifo ptr */
         u32 _unused1;           /* padding */
@@ -27426,7 +27662,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/sgi/hpc3.h linux-2.4.32-rc1.mips/i
   
         u32 _unused2[0x1000/4 - 8];     /* padding */
   
-@@ -221,7 +221,7 @@
+@@ -221,7 +221,7 @@ struct hpc3_regs {
   #define HPC3_BESTAT_PIDMASK   0x3f700 /* DMA channel parity identifier */
   
         u32 _unused1[0x14000/4 - 5];    /* padding */
@@ -27435,7 +27671,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/sgi/hpc3.h linux-2.4.32-rc1.mips/i
         /* Now direct PIO per-HPC3 peripheral access to external regs. */
         volatile u32 scsi0_ext[256];    /* SCSI channel 0 external regs */
         u32 _unused2[0x7c00/4];
-@@ -304,7 +304,7 @@
+@@ -304,7 +304,7 @@ struct hpc3_regs {
         volatile u32 bbram[8192-50-14]; /* Battery backed ram */
   };
   
@@ -27444,9 +27680,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/sgi/hpc3.h linux-2.4.32-rc1.mips/i
    * It is possible to have two HPC3's within the address space on
    * one machine, though only having one is more likely on an Indy.
    */
-diff -Nur linux-2.4.32-rc1/include/asm-mips64/sn/nmi.h linux-2.4.32-rc1.mips/include/asm-mips64/sn/nmi.h
---- linux-2.4.32-rc1/include/asm-mips64/sn/nmi.h       2002-11-29 00:53:15.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips64/sn/nmi.h  2002-08-06 01:53:40.000000000 +0200
+Index: linux-2.4.35.4/include/asm-mips64/sn/nmi.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/sn/nmi.h
++++ linux-2.4.35.4/include/asm-mips64/sn/nmi.h
  @@ -8,7 +8,7 @@
   #ifndef __ASM_SN_NMI_H
   #define __ASM_SN_NMI_H
@@ -27456,10 +27693,11 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/sn/nmi.h linux-2.4.32-rc1.mips/inc
   
   #include <asm/sn/addrs.h>
   
-diff -Nur linux-2.4.32-rc1/include/asm-mips64/unistd.h linux-2.4.32-rc1.mips/include/asm-mips64/unistd.h
---- linux-2.4.32-rc1/include/asm-mips64/unistd.h       2005-01-19 15:10:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-mips64/unistd.h  2004-11-24 21:30:06.000000000 +0100
-@@ -760,7 +760,7 @@
+Index: linux-2.4.35.4/include/asm-mips64/unistd.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/unistd.h
++++ linux-2.4.35.4/include/asm-mips64/unistd.h
+@@ -760,7 +760,7 @@ type name(void) \
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -27468,7 +27706,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/unistd.h linux-2.4.32-rc1.mips/inc
   }
   
   /*
-@@ -788,7 +788,7 @@
+@@ -788,7 +788,7 @@ type name(atype a) \
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -27477,7 +27715,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/unistd.h linux-2.4.32-rc1.mips/inc
   }
   
   #define _syscall2(type,name,atype,a,btype,b) \
-@@ -813,7 +813,7 @@
+@@ -813,7 +813,7 @@ type name(atype a, btype b) \
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -27486,7 +27724,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/unistd.h linux-2.4.32-rc1.mips/inc
   }
   
   #define _syscall3(type,name,atype,a,btype,b,ctype,c) \
-@@ -839,7 +839,7 @@
+@@ -839,7 +839,7 @@ type name(atype a, btype b, ctype c) \
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -27495,7 +27733,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/unistd.h linux-2.4.32-rc1.mips/inc
   }
   
   #define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \
-@@ -865,7 +865,7 @@
+@@ -865,7 +865,7 @@ type name(atype a, btype b, ctype c, dty
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -27504,7 +27742,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/unistd.h linux-2.4.32-rc1.mips/inc
   }
   
   #if (_MIPS_SIM == _MIPS_SIM_ABI32)
-@@ -902,7 +902,7 @@
+@@ -902,7 +902,7 @@ type name(atype a, btype b, ctype c, dty
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -27513,7 +27751,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/unistd.h linux-2.4.32-rc1.mips/inc
   }
   
   #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \
-@@ -935,7 +935,7 @@
+@@ -935,7 +935,7 @@ type name(atype a, btype b, ctype c, dty
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -27522,7 +27760,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/unistd.h linux-2.4.32-rc1.mips/inc
   }
   
   #endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */
-@@ -966,7 +966,7 @@
+@@ -966,7 +966,7 @@ type name (atype a,btype b,ctype c,dtype
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -27531,7 +27769,7 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/unistd.h linux-2.4.32-rc1.mips/inc
   }
   
   #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \
-@@ -995,7 +995,7 @@
+@@ -995,7 +995,7 @@ type name (atype a,btype b,ctype c,dtype
         if (__a3 == 0) \
                 return (type) __v0; \
         errno = __v0; \
@@ -27540,9 +27778,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips64/unistd.h linux-2.4.32-rc1.mips/inc
   }
   
   #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-diff -Nur linux-2.4.32-rc1/include/asm-ppc/param.h linux-2.4.32-rc1.mips/include/asm-ppc/param.h
---- linux-2.4.32-rc1/include/asm-ppc/param.h   2003-06-13 16:51:38.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/asm-ppc/param.h      2003-07-05 05:23:46.000000000 +0200
+Index: linux-2.4.35.4/include/asm-ppc/param.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-ppc/param.h
++++ linux-2.4.35.4/include/asm-ppc/param.h
  @@ -3,6 +3,9 @@
   
   #ifndef HZ
@@ -27553,9 +27792,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-ppc/param.h linux-2.4.32-rc1.mips/include
   #endif
   
   #define EXEC_PAGESIZE 4096
-diff -Nur linux-2.4.32-rc1/include/asm-s390/param.h linux-2.4.32-rc1.mips/include/asm-s390/param.h
---- linux-2.4.32-rc1/include/asm-s390/param.h  2001-02-13 23:13:44.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-s390/param.h     2001-03-09 21:34:48.000000000 +0100
+Index: linux-2.4.35.4/include/asm-s390/param.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-s390/param.h
++++ linux-2.4.35.4/include/asm-s390/param.h
  @@ -11,6 +11,9 @@
   
   #ifndef HZ
@@ -27566,9 +27806,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-s390/param.h linux-2.4.32-rc1.mips/includ
   #endif
   
   #define EXEC_PAGESIZE 4096
-diff -Nur linux-2.4.32-rc1/include/asm-sh/param.h linux-2.4.32-rc1.mips/include/asm-sh/param.h
---- linux-2.4.32-rc1/include/asm-sh/param.h    2001-01-04 22:19:13.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-sh/param.h       2001-01-11 05:02:45.000000000 +0100
+Index: linux-2.4.35.4/include/asm-sh/param.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-sh/param.h
++++ linux-2.4.35.4/include/asm-sh/param.h
  @@ -3,6 +3,9 @@
   
   #ifndef HZ
@@ -27579,9 +27820,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-sh/param.h linux-2.4.32-rc1.mips/include/
   #endif
   
   #define EXEC_PAGESIZE 4096
-diff -Nur linux-2.4.32-rc1/include/asm-sparc/param.h linux-2.4.32-rc1.mips/include/asm-sparc/param.h
---- linux-2.4.32-rc1/include/asm-sparc/param.h 2000-10-30 23:34:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-sparc/param.h    2000-11-23 03:00:56.000000000 +0100
+Index: linux-2.4.35.4/include/asm-sparc/param.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-sparc/param.h
++++ linux-2.4.35.4/include/asm-sparc/param.h
  @@ -4,6 +4,9 @@
   
   #ifndef HZ
@@ -27592,9 +27834,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-sparc/param.h linux-2.4.32-rc1.mips/inclu
   #endif
   
   #define EXEC_PAGESIZE 8192    /* Thanks for sun4's we carry baggage... */
-diff -Nur linux-2.4.32-rc1/include/asm-sparc64/param.h linux-2.4.32-rc1.mips/include/asm-sparc64/param.h
---- linux-2.4.32-rc1/include/asm-sparc64/param.h       2000-10-30 23:34:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/asm-sparc64/param.h  2000-11-23 03:00:56.000000000 +0100
+Index: linux-2.4.35.4/include/asm-sparc64/param.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-sparc64/param.h
++++ linux-2.4.35.4/include/asm-sparc64/param.h
  @@ -4,6 +4,9 @@
   
   #ifndef HZ
@@ -27605,9 +27848,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-sparc64/param.h linux-2.4.32-rc1.mips/inc
   #endif
   
   #define EXEC_PAGESIZE 8192    /* Thanks for sun4's we carry baggage... */
-diff -Nur linux-2.4.32-rc1/include/linux/i2c-algo-au1550.h linux-2.4.32-rc1.mips/include/linux/i2c-algo-au1550.h
---- linux-2.4.32-rc1/include/linux/i2c-algo-au1550.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/linux/i2c-algo-au1550.h      2004-07-07 02:38:02.000000000 +0200
+Index: linux-2.4.35.4/include/linux/i2c-algo-au1550.h
+===================================================================
+--- /dev/null
++++ linux-2.4.35.4/include/linux/i2c-algo-au1550.h
  @@ -0,0 +1,31 @@
  +/*
  + * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com>
@@ -27640,19 +27884,20 @@ diff -Nur linux-2.4.32-rc1/include/linux/i2c-algo-au1550.h linux-2.4.32-rc1.mips
  +int i2c_au1550_del_bus(struct i2c_adapter *);
  +
  +#endif /* I2C_ALGO_AU1550_H */
-diff -Nur linux-2.4.32-rc1/include/linux/i2c-id.h linux-2.4.32-rc1.mips/include/linux/i2c-id.h
---- linux-2.4.32-rc1/include/linux/i2c-id.h    2004-02-18 14:36:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/linux/i2c-id.h       2004-07-07 02:38:02.000000000 +0200
-@@ -156,6 +156,8 @@
- 
- #define I2C_ALGO_SGI  0x130000        /* SGI algorithm                */
+Index: linux-2.4.35.4/include/linux/i2c-id.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/i2c-id.h
++++ linux-2.4.35.4/include/linux/i2c-id.h
+@@ -155,6 +155,8 @@
+ #define I2C_ALGO_SIBYTE 0x150000      /* Broadcom SiByte SOCs         */
+ #define I2C_ALGO_SGI  0x160000        /* SGI algorithm                */
   
  +#define I2C_ALGO_AU1550       0x140000        /* Alchemy Au1550 PSC           */
  +
   #define I2C_ALGO_EXP  0x800000        /* experimental                 */
   
   #define I2C_ALGO_MASK 0xff0000        /* Mask for algorithms          */
-@@ -204,6 +206,9 @@
+@@ -203,6 +205,9 @@
   #define I2C_HW_SGI_VINO       0x00
   #define I2C_HW_SGI_MACE       0x01
   
@@ -27662,10 +27907,11 @@ diff -Nur linux-2.4.32-rc1/include/linux/i2c-id.h linux-2.4.32-rc1.mips/include/
   /* --- SMBus only adapters                                            */
   #define I2C_HW_SMBUS_PIIX4    0x00
   #define I2C_HW_SMBUS_ALI15X3  0x01
-diff -Nur linux-2.4.32-rc1/include/linux/sched.h linux-2.4.32-rc1.mips/include/linux/sched.h
---- linux-2.4.32-rc1/include/linux/sched.h     2005-01-19 15:10:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/linux/sched.h        2004-11-29 18:47:18.000000000 +0100
-@@ -617,6 +617,10 @@
+Index: linux-2.4.35.4/include/linux/sched.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/sched.h
++++ linux-2.4.35.4/include/linux/sched.h
+@@ -617,6 +617,10 @@ asmlinkage long sys_wait4(pid_t pid,unsi
   extern int in_group_p(gid_t);
   extern int in_egroup_p(gid_t);
   
@@ -27676,10 +27922,11 @@ diff -Nur linux-2.4.32-rc1/include/linux/sched.h linux-2.4.32-rc1.mips/include/l
   extern void proc_caches_init(void);
   extern void flush_signals(struct task_struct *);
   extern void flush_signal_handlers(struct task_struct *);
-diff -Nur linux-2.4.32-rc1/include/linux/serial.h linux-2.4.32-rc1.mips/include/linux/serial.h
---- linux-2.4.32-rc1/include/linux/serial.h    2002-08-03 02:39:45.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/linux/serial.h       2004-07-31 02:17:57.000000000 +0200
-@@ -75,7 +75,8 @@
+Index: linux-2.4.35.4/include/linux/serial.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/serial.h
++++ linux-2.4.35.4/include/linux/serial.h
+@@ -75,7 +75,8 @@ struct serial_struct {
   #define PORT_16654    11
   #define PORT_16850    12
   #define PORT_RSA      13      /* RSA-DV II/S card */
@@ -27689,9 +27936,10 @@ diff -Nur linux-2.4.32-rc1/include/linux/serial.h linux-2.4.32-rc1.mips/include/
   
   #define SERIAL_IO_PORT        0
   #define SERIAL_IO_HUB6        1
-diff -Nur linux-2.4.32-rc1/include/linux/swap.h linux-2.4.32-rc1.mips/include/linux/swap.h
---- linux-2.4.32-rc1/include/linux/swap.h      2005-01-19 15:10:12.000000000 +0100
-+++ linux-2.4.32-rc1.mips/include/linux/swap.h 2004-11-29 18:47:18.000000000 +0100
+Index: linux-2.4.35.4/include/linux/swap.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/swap.h
++++ linux-2.4.35.4/include/linux/swap.h
  @@ -1,6 +1,12 @@
   #ifndef _LINUX_SWAP_H
   #define _LINUX_SWAP_H
@@ -27714,7 +27962,7 @@ diff -Nur linux-2.4.32-rc1/include/linux/swap.h linux-2.4.32-rc1.mips/include/li
   /*
    * Magic header for a swap area. The first part of the union is
    * what the swap magic looks like for the old (limited to 128MB)
-@@ -39,8 +43,6 @@
+@@ -39,8 +43,6 @@ union swap_header {
         } info;
   };
   
@@ -27723,10 +27971,11 @@ diff -Nur linux-2.4.32-rc1/include/linux/swap.h linux-2.4.32-rc1.mips/include/li
   /*
    * Max bad pages in the new format..
    */
-diff -Nur linux-2.4.32-rc1/include/video/newport.h linux-2.4.32-rc1.mips/include/video/newport.h
---- linux-2.4.32-rc1/include/video/newport.h   2001-04-12 21:20:31.000000000 +0200
-+++ linux-2.4.32-rc1.mips/include/video/newport.h      2004-09-23 15:32:29.000000000 +0200
-@@ -291,8 +291,6 @@
+Index: linux-2.4.35.4/include/video/newport.h
+===================================================================
+--- linux-2.4.35.4.orig/include/video/newport.h
++++ linux-2.4.35.4/include/video/newport.h
+@@ -291,8 +291,6 @@ struct newport_regs {
         unsigned int _unused2[0x1ef];
         struct newport_cregs cgo;
   };
@@ -27735,7 +27984,7 @@ diff -Nur linux-2.4.32-rc1/include/video/newport.h linux-2.4.32-rc1.mips/include
   
   typedef struct {
         unsigned int drawmode1;
-@@ -450,38 +448,26 @@
+@@ -450,38 +448,26 @@ static __inline__ void newport_cmap_setr
   
   /* Miscellaneous NEWPORT routines. */
   #define BUSY_TIMEOUT 100000
@@ -27784,7 +28033,7 @@ diff -Nur linux-2.4.32-rc1/include/video/newport.h linux-2.4.32-rc1.mips/include
   /*
    * DCBMODE register defines:
    */
-@@ -564,7 +550,7 @@
+@@ -564,7 +550,7 @@ xmap9FIFOWait (struct newport_regs *rex)
   {
           rex->set.dcbmode = DCB_XMAP0 | XM9_CRS_FIFO_AVAIL |
                 DCB_DATAWIDTH_1 | R_DCB_XMAP9_PROTOCOL;
@@ -27793,10 +28042,11 @@ diff -Nur linux-2.4.32-rc1/include/video/newport.h linux-2.4.32-rc1.mips/include
         
           while ((rex->set.dcbdata0.bybytes.b3 & 3) != XM9_FIFO_EMPTY)
                 ;
-diff -Nur linux-2.4.32-rc1/init/main.c linux-2.4.32-rc1.mips/init/main.c
---- linux-2.4.32-rc1/init/main.c       2004-11-17 12:54:22.000000000 +0100
-+++ linux-2.4.32-rc1.mips/init/main.c  2004-11-19 01:28:52.000000000 +0100
-@@ -296,7 +296,6 @@
+Index: linux-2.4.35.4/init/main.c
+===================================================================
+--- linux-2.4.35.4.orig/init/main.c
++++ linux-2.4.35.4/init/main.c
+@@ -296,7 +296,6 @@ static void __init parse_options(char *l
   
   
   extern void setup_arch(char **);
@@ -27804,10 +28054,11 @@ diff -Nur linux-2.4.32-rc1/init/main.c linux-2.4.32-rc1.mips/init/main.c
   
   unsigned long wait_init_idle;
   
-diff -Nur linux-2.4.32-rc1/kernel/exit.c linux-2.4.32-rc1.mips/kernel/exit.c
---- linux-2.4.32-rc1/kernel/exit.c     2002-11-29 00:53:15.000000000 +0100
-+++ linux-2.4.32-rc1.mips/kernel/exit.c        2003-01-11 18:53:18.000000000 +0100
-@@ -26,7 +26,7 @@
+Index: linux-2.4.35.4/kernel/exit.c
+===================================================================
+--- linux-2.4.35.4.orig/kernel/exit.c
++++ linux-2.4.35.4/kernel/exit.c
+@@ -26,7 +26,7 @@ extern struct task_struct *child_reaper;
   
   int getrusage(struct task_struct *, int, struct rusage *);
   
@@ -27816,9 +28067,10 @@ diff -Nur linux-2.4.32-rc1/kernel/exit.c linux-2.4.32-rc1.mips/kernel/exit.c
   {
         if (p != current) {
   #ifdef CONFIG_SMP
-diff -Nur linux-2.4.32-rc1/kernel/signal.c linux-2.4.32-rc1.mips/kernel/signal.c
---- linux-2.4.32-rc1/kernel/signal.c   2004-02-18 14:36:32.000000000 +0100
-+++ linux-2.4.32-rc1.mips/kernel/signal.c      2004-01-20 16:10:34.000000000 +0100
+Index: linux-2.4.35.4/kernel/signal.c
+===================================================================
+--- linux-2.4.35.4.orig/kernel/signal.c
++++ linux-2.4.35.4/kernel/signal.c
  @@ -14,6 +14,7 @@
   #include <linux/init.h>
   #include <linux/sched.h>
@@ -27842,7 +28094,7 @@ diff -Nur linux-2.4.32-rc1/kernel/signal.c linux-2.4.32-rc1.mips/kernel/signal.c
   static kmem_cache_t *sigqueue_cachep;
   
   atomic_t nr_queued_signals;
-@@ -270,6 +279,11 @@
+@@ -270,6 +279,11 @@ printk("SIG dequeue (%s:%d): %d ", curre
         signal_pending(current));
   #endif
   
@@ -27854,7 +28106,7 @@ diff -Nur linux-2.4.32-rc1/kernel/signal.c linux-2.4.32-rc1.mips/kernel/signal.c
         sig = next_signal(current, mask);
         if (sig) {
                 if (current->notifier) {
-@@ -293,6 +307,10 @@
+@@ -293,6 +307,10 @@ printk("SIG dequeue (%s:%d): %d ", curre
   printk(" %d -> %d\n", signal_pending(current), sig);
   #endif
   
@@ -27865,7 +28117,7 @@ diff -Nur linux-2.4.32-rc1/kernel/signal.c linux-2.4.32-rc1.mips/kernel/signal.c
         return sig;
   }
   
-@@ -540,6 +558,11 @@
+@@ -540,6 +558,11 @@ send_sig_info(int sig, struct siginfo *i
   printk("SIG queue (%s:%d): %d ", t->comm, t->pid, sig);
   #endif
   
@@ -27877,7 +28129,7 @@ diff -Nur linux-2.4.32-rc1/kernel/signal.c linux-2.4.32-rc1.mips/kernel/signal.c
         ret = -EINVAL;
         if (sig < 0 || sig > _NSIG)
                 goto out_nolock;
-@@ -778,8 +801,8 @@
+@@ -778,8 +801,8 @@ void do_notify_parent(struct task_struct
         info.si_uid = tsk->uid;
   
         /* FIXME: find out whether or not this is supposed to be c*time. */
@@ -27888,10 +28140,11 @@ diff -Nur linux-2.4.32-rc1/kernel/signal.c linux-2.4.32-rc1.mips/kernel/signal.c
   
         status = tsk->exit_code & 0x7f;
         why = SI_KERNEL;        /* shouldn't happen */
-diff -Nur linux-2.4.32-rc1/kernel/sys.c linux-2.4.32-rc1.mips/kernel/sys.c
---- linux-2.4.32-rc1/kernel/sys.c      2003-11-28 19:26:21.000000000 +0100
-+++ linux-2.4.32-rc1.mips/kernel/sys.c 2003-11-17 02:07:47.000000000 +0100
-@@ -801,16 +801,23 @@
+Index: linux-2.4.35.4/kernel/sys.c
+===================================================================
+--- linux-2.4.35.4.orig/kernel/sys.c
++++ linux-2.4.35.4/kernel/sys.c
+@@ -801,16 +801,23 @@ asmlinkage long sys_setfsgid(gid_t gid)
   
   asmlinkage long sys_times(struct tms * tbuf)
   {
@@ -27918,10 +28171,11 @@ diff -Nur linux-2.4.32-rc1/kernel/sys.c linux-2.4.32-rc1.mips/kernel/sys.c
   }
   
   /*
-diff -Nur linux-2.4.32-rc1/lib/Makefile linux-2.4.32-rc1.mips/lib/Makefile
---- linux-2.4.32-rc1/lib/Makefile      2004-04-14 15:05:40.000000000 +0200
-+++ linux-2.4.32-rc1.mips/lib/Makefile 2004-04-16 05:14:21.000000000 +0200
-@@ -27,6 +27,7 @@
+Index: linux-2.4.35.4/lib/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/lib/Makefile
++++ linux-2.4.35.4/lib/Makefile
+@@ -27,6 +27,7 @@ obj-$(CONFIG_CRC32)     += crc32.o
   subdir-$(CONFIG_ZLIB_INFLATE) += zlib_inflate
   subdir-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate
   
@@ -27929,10 +28183,11 @@ diff -Nur linux-2.4.32-rc1/lib/Makefile linux-2.4.32-rc1.mips/lib/Makefile
   include $(TOPDIR)/drivers/net/Makefile.lib
   include $(TOPDIR)/drivers/usb/Makefile.lib
   include $(TOPDIR)/drivers/bluetooth/Makefile.lib
-diff -Nur linux-2.4.32-rc1/Makefile linux-2.4.32-rc1.mips/Makefile
---- linux-2.4.32-rc1/Makefile  2005-10-24 11:33:30.000000000 +0200
-+++ linux-2.4.32-rc1.mips/Makefile     2005-09-23 22:41:15.000000000 +0200
-@@ -462,10 +462,11 @@
+Index: linux-2.4.35.4/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/Makefile
++++ linux-2.4.35.4/Makefile
+@@ -469,10 +469,11 @@ mrproper: clean archmrproper
         $(MAKE) -C Documentation/DocBook mrproper
   
   distclean: mrproper
@@ -27948,7 +28203,7 @@ diff -Nur linux-2.4.32-rc1/Makefile linux-2.4.32-rc1.mips/Makefile
   
   backup: mrproper
         cd .. && tar cf - linux/ | gzip -9 > backup.gz
-@@ -492,7 +493,7 @@
+@@ -499,7 +500,7 @@ mandocs:
         $(MAKE) -C Documentation/DocBook man
   
   sums: