update brcm-2.4 to 2.4.35.4, integrate new broadcom system code, update broadcom-wl to a contributed version (v4.150.10.5) - no bcm57xx support yet, will follow shortly

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10137 3c298f89-4303-0410-b956-a3cf2f4a3e73
author: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2008-01-06 19:28:07 +0000
committer: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2008-01-06 19:28:07 +0000
commit: 90fba37c49479ed4e5233dc0d348cdf7d24c9ee1 (patch)
tree: 58af9e3b3204308a2b7853127331f4d693e1b744 /target/linux/generic-2.4/patches
parent: b59f896089edf83ce4cd1951001b6cc889bdd287 (diff)
66 files changed, 3999 insertions, 3032 deletions
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 16177c53b9..bdc0cdedd0 100644
--- a/target/linux/generic-2.4/patches/000-linux_mips.patch
+++ b/target/linux/generic-2.4/patches/000-linux_mips.patch
@@ -1,6 +1,7 @@
-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
+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	2007-12-15 05:19:42.862863653 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c	2007-12-15 05:19:44.782973074 +0100
 @@ -172,14 +172,14 @@
  	{ AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
  	{ AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0},
@@ -47,9 +48,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/au1000/common/cputable.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/cputable.c	2007-12-15 05:19:42.870864109 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/cputable.c	2007-12-15 05:19:44.786973303 +0100
 @@ -39,7 +39,8 @@
      { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1 },
      { 0xffffffff, 0x02030204, "Au1100 BE", 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	2007-12-15 05:19:42.878864567 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/dbdma.c	2007-12-15 05:19:44.786973303 +0100
 @@ -41,6 +41,8 @@
  #include <asm/au1xxx_dbdma.h>
  #include <asm/system.h>
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/common/gpio.c	2007-12-15 05:19:44.786973303 +0100
 @@ -0,0 +1,118 @@
 +/*
 + *  This program is free software; you can redistribute	 it and/or modify it
@@ -763,9 +767,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/irq.c	2007-12-15 05:19:42.890865248 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/irq.c	2007-12-15 05:19:44.786973303 +0100
 @@ -303,8 +303,30 @@
  };
  
@@ -833,9 +838,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/au1000/common/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/Makefile	2007-12-15 05:19:42.898865706 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/Makefile	2007-12-15 05:19:44.786973303 +0100
 @@ -19,9 +19,9 @@
  export-objs		= prom.o clocks.o power.o usbdev.o
  
@@ -848,9 +854,10 @@ 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
+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	2007-12-15 05:19:42.906866162 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c	2007-12-15 05:19:44.790973529 +0100
 @@ -75,9 +75,13 @@
  
  #ifdef CONFIG_NONCOHERENT_IO
@@ -867,9 +874,10 @@ 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
+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	2007-12-15 05:19:42.910866388 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c	2007-12-15 05:19:44.790973529 +0100
 @@ -162,6 +162,7 @@
  static int config_access(unsigned char access_type, struct pci_dev *dev, 
  			 unsigned char where, u32 * data)
@@ -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	2007-12-15 05:19:42.918866846 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/power.c	2007-12-15 05:19:44.790973529 +0100
 @@ -50,7 +50,6 @@
  
  static void calibrate_delay(void);
@@ -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	2007-12-15 05:19:42.926867302 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/reset.c	2007-12-15 05:19:44.790973529 +0100
 @@ -37,8 +37,6 @@
  #include <asm/system.h>
  #include <asm/au1000.h>
@@ -1223,9 +1233,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/common/setup.c	2007-12-15 05:19:42.934867757 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/setup.c	2007-12-15 05:19:44.794973758 +0100
 @@ -174,6 +174,40 @@
  	initrd_end = (unsigned long)&__rd_end;
  #endif
@@ -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	2007-12-15 05:19:42.938867986 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/sleeper.S	2007-12-15 05:19:44.794973758 +0100
 @@ -15,17 +15,48 @@
  #include <asm/addrspace.h>
  #include <asm/regdef.h>
@@ -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	2007-12-15 05:19:42.946868441 +0100
++++ linux-2.4.35.4/arch/mips/au1000/common/time.c	2007-12-15 05:19:44.794973758 +0100
 @@ -50,7 +50,6 @@
  #include <linux/mc146818rtc.h>
  #include <linux/timex.h>
@@ -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	2007-12-15 05:19:42.954868897 +0100
++++ linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c	2007-12-15 05:19:44.794973758 +0100
 @@ -46,10 +46,22 @@
  #include <asm/au1000.h>
  #include <asm/db1x00.h>
@@ -1739,9 +1753,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/irqmap.c	2007-12-15 05:19:42.962869352 +0100
++++ linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c	2007-12-15 05:19:44.794973758 +0100
 @@ -53,6 +53,7 @@
  #ifdef CONFIG_MIPS_DB1550
  	{ AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 IRQ#
@@ -1750,9 +1765,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/Makefile	2007-12-15 05:19:42.970869808 +0100
++++ linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile	2007-12-15 05:19:44.794973758 +0100
 @@ -17,4 +17,11 @@
  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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c	2007-12-15 05:19:44.798973987 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c	2007-12-15 05:19:44.798973987 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c	2007-12-15 05:19:44.798973987 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c	2007-12-15 05:19:44.798973987 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c	2007-12-15 05:19:44.802974213 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c	2007-12-15 05:19:44.802974213 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile	2007-12-15 05:19:44.802974213 +0100
 @@ -0,0 +1,25 @@
 +#
 +#  Copyright 2000 MontaVista Software Inc.
@@ -2838,9 +2861,10 @@ 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
+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	2007-12-15 05:19:43.014872316 +0100
++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c	2007-12-15 05:19:44.802974213 +0100
 @@ -51,12 +51,19 @@
  {
  }
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c	2007-12-15 05:19:44.802974213 +0100
 @@ -0,0 +1,308 @@
 +/*
 + *  Copyright (C) 2003 Metrowerks, All Rights Reserved.
@@ -3173,9 +3198,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/hydrogen3/Makefile	2007-12-15 05:19:43.026873001 +0100
++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile	2007-12-15 05:19:44.802974213 +0100
 @@ -14,6 +14,11 @@
  
  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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c	2007-12-15 05:19:44.802974213 +0100
 @@ -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	2007-12-15 05:19:43.038873685 +0100
++++ linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c	2007-12-15 05:19:44.806974443 +0100
 @@ -48,6 +48,12 @@
  
  extern struct rtc_ops no_rtc_ops;
@@ -3298,9 +3326,10 @@ 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
+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	2007-12-15 05:19:43.046874140 +0100
++++ linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c	2007-12-15 05:19:44.806974443 +0100
 @@ -72,10 +72,10 @@
  	 *	A       B       C       D
  	 */
@@ -3316,9 +3345,10 @@ 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
+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	2007-12-15 05:19:43.054874596 +0100
++++ linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c	2007-12-15 05:19:44.806974443 +0100
 @@ -58,6 +58,10 @@
  {
  }
@@ -3330,9 +3360,10 @@ 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
+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	2007-12-15 05:19:43.062875051 +0100
++++ linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c	2007-12-15 05:19:44.806974443 +0100
 @@ -62,6 +62,10 @@
      au_writel(0x00000000, 0xAE00001C);
  }
@@ -3344,9 +3375,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/au1000/pb1100/Makefile	2007-12-15 05:19:43.070875507 +0100
++++ linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile	2007-12-15 05:19:44.806974443 +0100
 @@ -16,4 +16,10 @@
  
  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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c	2007-12-15 05:19:44.806974443 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c	2007-12-15 05:19:44.810974669 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/pb1200/init.c	2007-12-15 05:19:44.810974669 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c	2007-12-15 05:19:44.810974669 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile	2007-12-15 05:19:44.810974669 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c	2007-12-15 05:19:44.810974669 +0100
 @@ -0,0 +1,141 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -4147,9 +4185,10 @@ 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
+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	2007-12-15 05:19:43.110877786 +0100
++++ linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c	2007-12-15 05:19:44.810974669 +0100
 @@ -62,6 +62,10 @@
      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	2007-12-15 05:19:43.118878244 +0100
++++ linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c	2007-12-15 05:19:44.814974898 +0100
 @@ -48,12 +48,31 @@
  
  extern struct rtc_ops no_rtc_ops;
@@ -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	2007-12-15 05:19:43.126878700 +0100
++++ linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c	2007-12-15 05:19:44.814974898 +0100
 @@ -50,6 +50,9 @@
  au1xxx_irq_map_t au1xxx_irq_map[] = {
  	{ AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 },
@@ -4246,9 +4287,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/config-shared.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/config-shared.in	2007-12-15 05:19:43.134879155 +0100
++++ linux-2.4.35.4/arch/mips/config-shared.in	2007-12-15 05:19:44.814974898 +0100
 @@ -21,16 +21,19 @@
  comment 'Machine selection'
  dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL
@@ -4369,9 +4411,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig	2007-12-15 05:19:43.142879610 +0100
++++ linux-2.4.35.4/arch/mips/defconfig	2007-12-15 05:19:44.814974898 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -4414,9 +4457,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-atlas
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-atlas	2007-12-15 05:19:43.150880066 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-atlas	2007-12-15 05:19:44.818975127 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -4459,9 +4503,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-bosporus
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-bosporus	2007-12-15 05:19:43.158880524 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-bosporus	2007-12-15 05:19:44.818975127 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -4522,9 +4567,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-capcella
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-capcella	2007-12-15 05:19:43.162880750 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-capcella	2007-12-15 05:19:44.818975127 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -4555,9 +4601,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-cobalt
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-cobalt	2007-12-15 05:19:43.170881205 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-cobalt	2007-12-15 05:19:44.818975127 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -4588,9 +4635,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-csb250
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-csb250	2007-12-15 05:19:43.178881664 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-csb250	2007-12-15 05:19:44.818975127 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -4621,9 +4669,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-db1000
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-db1000	2007-12-15 05:19:43.186882119 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-db1000	2007-12-15 05:19:44.822975353 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -4674,9 +4723,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-db1100
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-db1100	2007-12-15 05:19:43.190882345 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-db1100	2007-12-15 05:19:44.822975353 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/defconfig-db1200	2007-12-15 05:19:44.822975353 +0100
 @@ -0,0 +1,1032 @@
 +#
 +# Automatically generated make config: don't edit
@@ -5779,9 +5830,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-db1500
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-db1500	2007-12-15 05:19:43.202883030 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-db1500	2007-12-15 05:19:44.826975582 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -5812,9 +5864,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-db1550
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-db1550	2007-12-15 05:19:43.210883485 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-db1550	2007-12-15 05:19:44.826975582 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -5865,9 +5918,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5476	2007-12-15 05:19:43.218883943 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-ddb5476	2007-12-15 05:19:44.826975582 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -5898,9 +5952,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5477	2007-12-15 05:19:43.226884399 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-ddb5477	2007-12-15 05:19:44.826975582 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -5931,9 +5986,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-decstation
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-decstation	2007-12-15 05:19:43.234884854 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-decstation	2007-12-15 05:19:44.826975582 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -5976,9 +6032,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-e55
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-e55	2007-12-15 05:19:43.242885309 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-e55	2007-12-15 05:19:44.830975809 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -6009,9 +6066,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-eagle
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-eagle	2007-12-15 05:19:43.246885538 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-eagle	2007-12-15 05:19:44.830975809 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -6071,9 +6129,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-ev64120
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ev64120	2007-12-15 05:19:43.254885994 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-ev64120	2007-12-15 05:19:44.830975809 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -6104,9 +6163,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-ev96100
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ev96100	2007-12-15 05:19:43.262886449 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-ev96100	2007-12-15 05:19:44.830975809 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/defconfig-ficmmp	2007-12-15 05:19:44.834976038 +0100
 @@ -0,0 +1,862 @@
 +#
 +# Automatically generated make config: don't edit
@@ -7003,9 +7064,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-hp-lj	2007-12-15 05:19:43.274887133 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-hp-lj	2007-12-15 05:19:44.834976038 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7065,9 +7127,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-hydrogen3	2007-12-15 05:19:43.282887589 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-hydrogen3	2007-12-15 05:19:44.834976038 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7132,9 +7195,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-ip22
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ip22	2007-12-15 05:19:43.290888044 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-ip22	2007-12-15 05:19:44.834976038 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7177,9 +7241,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-it8172
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-it8172	2007-12-15 05:19:43.294888273 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-it8172	2007-12-15 05:19:44.838976267 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7239,9 +7304,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-ivr
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ivr	2007-12-15 05:19:43.302888729 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-ivr	2007-12-15 05:19:44.838976267 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7272,9 +7338,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-jmr3927	2007-12-15 05:19:43.310889184 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-jmr3927	2007-12-15 05:19:44.838976267 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7305,9 +7372,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-lasat
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-lasat	2007-12-15 05:19:43.318889642 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-lasat	2007-12-15 05:19:44.838976267 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7356,9 +7424,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-malta
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-malta	2007-12-15 05:19:43.322889868 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-malta	2007-12-15 05:19:44.842976493 +0100
 @@ -22,16 +22,19 @@
  #
  # CONFIG_ACER_PICA_61 is not set
@@ -7497,9 +7566,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-mirage
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-mirage	2007-12-15 05:19:43.330890324 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-mirage	2007-12-15 05:19:44.842976493 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7548,9 +7618,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-mpc30x	2007-12-15 05:19:43.338890782 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-mpc30x	2007-12-15 05:19:44.842976493 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7581,9 +7652,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-mtx-1	2007-12-15 05:19:43.346891237 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-mtx-1	2007-12-15 05:19:44.842976493 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7644,9 +7716,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-nino
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-nino	2007-12-15 05:19:43.354891693 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-nino	2007-12-15 05:19:44.846976722 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7677,9 +7750,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-ocelot
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ocelot	2007-12-15 05:19:43.358891922 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-ocelot	2007-12-15 05:19:44.846976722 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7728,9 +7802,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-osprey
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-osprey	2007-12-15 05:19:43.366892377 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-osprey	2007-12-15 05:19:44.846976722 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -7761,9 +7836,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-pb1000
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1000	2007-12-15 05:19:43.374892832 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-pb1000	2007-12-15 05:19:44.846976722 +0100
 @@ -30,8 +30,8 @@
  CONFIG_MIPS_PB1000=y
  # CONFIG_MIPS_PB1100 is not set
@@ -7821,9 +7897,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-pb1100
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1100	2007-12-15 05:19:43.382893288 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-pb1100	2007-12-15 05:19:44.850976948 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  CONFIG_MIPS_PB1100=y
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/defconfig-pb1200	2007-12-15 05:19:44.850976948 +0100
 @@ -0,0 +1,1060 @@
 +#
 +# Automatically generated make config: don't edit
@@ -8952,9 +9030,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-pb1500
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1500	2007-12-15 05:19:43.394893972 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-pb1500	2007-12-15 05:19:44.850976948 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9003,9 +9082,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-pb1550
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1550	2007-12-15 05:19:43.402894428 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-pb1550	2007-12-15 05:19:44.854977177 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9056,9 +9136,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-rbtx4927	2007-12-15 05:19:43.406894657 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-rbtx4927	2007-12-15 05:19:44.854977177 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9089,9 +9170,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-rm200
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-rm200	2007-12-15 05:19:43.414895112 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-rm200	2007-12-15 05:19:44.854977177 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9122,9 +9204,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-sb1250-swarm	2007-12-15 05:19:43.422895567 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm	2007-12-15 05:19:44.854977177 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9163,9 +9246,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-sead
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-sead	2007-12-15 05:19:43.430896023 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-sead	2007-12-15 05:19:44.854977177 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9184,9 +9268,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-stretch
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-stretch	2007-12-15 05:19:43.438896481 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-stretch	2007-12-15 05:19:44.858977407 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9229,9 +9314,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-tb0226
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-tb0226	2007-12-15 05:19:43.442896707 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-tb0226	2007-12-15 05:19:44.858977407 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9274,9 +9360,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-tb0229
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-tb0229	2007-12-15 05:19:43.450897163 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-tb0229	2007-12-15 05:19:44.858977407 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9307,9 +9394,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-ti1500
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-ti1500	2007-12-15 05:19:43.458897621 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-ti1500	2007-12-15 05:19:44.858977407 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9358,9 +9446,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-workpad
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-workpad	2007-12-15 05:19:43.466898076 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-workpad	2007-12-15 05:19:44.862977633 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9391,9 +9480,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-xxs1500	2007-12-15 05:19:43.474898531 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-xxs1500	2007-12-15 05:19:44.862977633 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9442,9 +9532,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/defconfig-yosemite
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig-yosemite	2007-12-15 05:19:43.478898761 +0100
++++ linux-2.4.35.4/arch/mips/defconfig-yosemite	2007-12-15 05:19:44.862977633 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -9487,9 +9578,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/cpu-probe.c	2007-12-15 05:19:43.486899216 +0100
++++ linux-2.4.35.4/arch/mips/kernel/cpu-probe.c	2007-12-15 05:19:44.862977633 +0100
 @@ -34,21 +34,16 @@
  		".set\tmips0");
  }
@@ -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	2007-12-15 05:19:43.494899671 +0100
++++ linux-2.4.35.4/arch/mips/kernel/head.S	2007-12-15 05:19:44.866977862 +0100
 @@ -43,9 +43,9 @@
  
  		/* Cache Error */
@@ -9729,9 +9822,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/kernel/process.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/process.c	2007-12-15 05:19:43.502900127 +0100
++++ linux-2.4.35.4/arch/mips/kernel/process.c	2007-12-15 05:19:44.866977862 +0100
 @@ -128,6 +128,26 @@
  	return 1;
  }
@@ -9759,9 +9853,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/kernel/scall_o32.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/scall_o32.S	2007-12-15 05:19:43.506900356 +0100
++++ linux-2.4.35.4/arch/mips/kernel/scall_o32.S	2007-12-15 05:19:44.866977862 +0100
 @@ -121,15 +121,14 @@
  
  trace_a_syscall:
@@ -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	2007-12-15 05:19:43.514900811 +0100
++++ linux-2.4.35.4/arch/mips/kernel/setup.c	2007-12-15 05:19:44.866977862 +0100
 @@ -5,7 +5,7 @@
   *
   * Copyright (C) 1995  Linus Torvalds
@@ -9812,9 +9908,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/kernel/traps.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/traps.c	2007-12-15 05:19:43.522901266 +0100
++++ linux-2.4.35.4/arch/mips/kernel/traps.c	2007-12-15 05:19:44.870978088 +0100
 @@ -452,9 +452,10 @@
  	}
  	ll_task = current;
@@ -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	2007-12-15 05:19:43.530901722 +0100
++++ linux-2.4.35.4/arch/mips/lib/rtc-no.c	2007-12-15 05:19:44.870978088 +0100
 @@ -6,10 +6,9 @@
   * Stub RTC routines to keep Linux from crashing on machine which don't
   * have a RTC chip.
@@ -9922,9 +10020,10 @@ diff -Nur linux-2.4.32-rc1/arch/mips/lib/rtc-no.c linux-2.4.32-rc1.mips/arch/mip
  };
 -
 -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	2007-12-15 05:19:43.538902180 +0100
++++ linux-2.4.35.4/arch/mips/lib/rtc-std.c	2007-12-15 05:19:44.870978088 +0100
 @@ -5,9 +5,8 @@
   *
   * RTC routines for PC style attached Dallas chip.
@@ -9942,10 +10041,11 @@ diff -Nur linux-2.4.32-rc1/arch/mips/lib/rtc-std.c linux-2.4.32-rc1.mips/arch/mi
  };
 -
 -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	2007-12-15 05:19:43.546902635 +0100
++++ linux-2.4.35.4/arch/mips/Makefile	2007-12-15 05:19:44.870978088 +0100
+@@ -209,7 +209,7 @@
  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 @@
  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 @@
  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 @@
  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 @@
  LOADADDR      += 0x80100000
  endif
  
@@ -10012,9 +10112,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/mm/cerr-sb1.c	2007-12-15 05:19:43.554903091 +0100
++++ linux-2.4.35.4/arch/mips/mm/cerr-sb1.c	2007-12-15 05:19:44.870978088 +0100
 @@ -252,14 +252,14 @@
  
  /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
@@ -10059,9 +10160,10 @@ 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
+Index: linux-2.4.35.4/arch/mips/mm/c-r4k.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/mm/c-r4k.c	2007-12-15 05:19:43.558903320 +0100
++++ linux-2.4.35.4/arch/mips/mm/c-r4k.c	2007-12-15 05:19:44.874978317 +0100
 @@ -867,9 +867,16 @@
  	 * 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.
@@ -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	2007-12-15 05:19:43.566903775 +0100
++++ linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S	2007-12-15 05:19:44.874978317 +0100
 @@ -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	2007-12-15 05:19:43.574904230 +0100
++++ linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S	2007-12-15 05:19:44.874978317 +0100
 @@ -184,13 +184,10 @@
  	P_MTC0	k0, CP0_ENTRYLO0		# load it
  	PTE_SRL	k1, k1, 6			# convert to entrylo1
@@ -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	2007-12-15 05:19:43.582904686 +0100
++++ linux-2.4.35.4/arch/mips/mm/tlb-r4k.c	2007-12-15 05:19:44.874978317 +0100
 @@ -3,17 +3,12 @@
   * License.  See the file "COPYING" in the main directory of this archive
   * for more details.
@@ -10504,9 +10609,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig	2007-12-15 05:19:43.590905141 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig	2007-12-15 05:19:44.874978317 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -10537,9 +10643,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/defconfig-atlas
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-atlas	2007-12-15 05:19:43.598905599 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig-atlas	2007-12-15 05:19:44.878978546 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -10582,9 +10689,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/defconfig-decstation
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-decstation	2007-12-15 05:19:43.606906055 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig-decstation	2007-12-15 05:19:44.878978546 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -10627,9 +10735,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/defconfig-ip22
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-ip22	2007-12-15 05:19:43.610906281 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig-ip22	2007-12-15 05:19:44.878978546 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -10672,9 +10781,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/defconfig-ip27
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-ip27	2007-12-15 05:19:43.618906739 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig-ip27	2007-12-15 05:19:44.878978546 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -10705,9 +10815,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-jaguar	2007-12-15 05:19:43.626907195 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig-jaguar	2007-12-15 05:19:44.882978773 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -10738,9 +10849,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/defconfig-malta
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-malta	2007-12-15 05:19:43.634907650 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig-malta	2007-12-15 05:19:44.882978773 +0100
 @@ -22,16 +22,19 @@
  #
  # CONFIG_ACER_PICA_61 is not set
@@ -10891,9 +11003,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-ocelotc	2007-12-15 05:19:43.638907879 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig-ocelotc	2007-12-15 05:19:44.882978773 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -10924,9 +11037,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-sb1250-swarm	2007-12-15 05:19:43.646908334 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm	2007-12-15 05:19:44.882978773 +0100
 @@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -10965,9 +11079,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/defconfig-sead
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig-sead	2007-12-15 05:19:43.654908790 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig-sead	2007-12-15 05:19:44.886979002 +0100
 @@ -28,8 +28,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
@@ -10986,9 +11101,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfn32.c	2007-12-15 05:19:43.662909245 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c	2007-12-15 05:19:44.894979457 +0100
 @@ -116,4 +116,7 @@
  #undef MODULE_DESCRIPTION
  #undef MODULE_AUTHOR
@@ -10997,9 +11113,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfo32.c	2007-12-15 05:19:43.670909700 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c	2007-12-15 05:19:44.898979686 +0100
 @@ -137,4 +137,7 @@
  #undef MODULE_DESCRIPTION
  #undef MODULE_AUTHOR
@@ -11008,9 +11125,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/head.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/head.S	2007-12-15 05:19:43.674909929 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/head.S	2007-12-15 05:19:44.898979686 +0100
 @@ -91,6 +91,21 @@
  	__INIT
  
@@ -11095,9 +11213,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/ioctl32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/ioctl32.c	2007-12-15 05:19:43.682910385 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/ioctl32.c	2007-12-15 05:19:44.898979686 +0100
 @@ -2352,7 +2352,7 @@
  	IOCTL32_HANDLER(AUTOFS_IOC_SETTIMEOUT32, ioc_settimeout),
  	IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE),
@@ -11107,9 +11226,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/linux32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/linux32.c	2007-12-15 05:19:43.690910840 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/linux32.c	2007-12-15 05:19:44.902979912 +0100
 @@ -1101,6 +1101,7 @@
  	 * specially as they have atomicity guarantees and can handle
  	 * iovec's natively
@@ -11196,9 +11316,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/process.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/process.c	2007-12-15 05:19:43.698911298 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/process.c	2007-12-15 05:19:44.902979912 +0100
 @@ -125,6 +125,25 @@
  	return 1;
  }
@@ -11225,9 +11346,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/scall_64.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_64.S	2007-12-15 05:19:43.702911525 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/scall_64.S	2007-12-15 05:19:44.902979912 +0100
 @@ -102,15 +102,14 @@
  
  trace_a_syscall:
@@ -11246,9 +11368,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/scall_n32.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_n32.S	2007-12-15 05:19:43.710911980 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/scall_n32.S	2007-12-15 05:19:44.902979912 +0100
 @@ -106,15 +106,14 @@
  
  trace_a_syscall:
@@ -11267,9 +11390,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_o32.S	2007-12-15 05:19:43.718912438 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/scall_o32.S	2007-12-15 05:19:44.906980142 +0100
 @@ -118,9 +118,8 @@
  	sd	a6, PT_R10(sp)
  	sd	a7, PT_R11(sp)
@@ -11299,9 +11423,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/setup.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/setup.c	2007-12-15 05:19:43.726912894 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/setup.c	2007-12-15 05:19:44.906980142 +0100
 @@ -129,14 +129,6 @@
  	 */
  	load_mmu();
@@ -11317,9 +11442,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/signal_n32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/signal_n32.c	2007-12-15 05:19:43.730913120 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/signal_n32.c	2007-12-15 05:19:44.906980142 +0100
 @@ -68,7 +68,7 @@
  };
  
@@ -11329,9 +11455,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/kernel/traps.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/traps.c	2007-12-15 05:19:43.738913578 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/traps.c	2007-12-15 05:19:44.906980142 +0100
 @@ -462,9 +462,10 @@
  	}
  	ll_task = current;
@@ -11422,9 +11549,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/mm/cerr-sb1.c	2007-12-15 05:19:43.746914033 +0100
++++ linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c	2007-12-15 05:19:44.906980142 +0100
 @@ -252,14 +252,14 @@
  
  /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
@@ -11469,9 +11597,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/mm/c-r4k.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/mm/c-r4k.c	2007-12-15 05:19:43.754914488 +0100
++++ linux-2.4.35.4/arch/mips64/mm/c-r4k.c	2007-12-15 05:19:44.910980368 +0100
 @@ -867,9 +867,16 @@
  	 * 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.
@@ -11502,9 +11631,10 @@ 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
+Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/mm/tlbex-r4k.S	2007-12-15 05:19:43.762914944 +0100
++++ linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S	2007-12-15 05:19:44.910980368 +0100
 @@ -125,6 +125,33 @@
  	 nop
  END(except_vec1_r4k)
@@ -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	2007-12-15 05:19:43.770915399 +0100
++++ linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c	2007-12-15 05:19:44.910980368 +0100
 @@ -1,24 +1,12 @@
  /*
 - * Carsten Langgaard, carstenl@mips.com
@@ -11967,9 +12098,10 @@ 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
+Index: linux-2.4.35.4/drivers/char/au1000_gpio.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/au1000_gpio.c	2007-12-15 05:19:43.778915857 +0100
++++ linux-2.4.35.4/drivers/char/au1000_gpio.c	2007-12-15 05:19:44.910980368 +0100
 @@ -246,7 +246,7 @@
  
  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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/char/au1550_psc_spi.c	2007-12-15 05:19:44.914980597 +0100
 @@ -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	2007-12-15 05:19:43.790916539 +0100
++++ linux-2.4.35.4/drivers/char/Config.in	2007-12-15 05:19:44.914980597 +0100
+@@ -314,14 +314,11 @@
  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 @@
        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 @@
  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	2007-12-15 05:19:43.798916997 +0100
++++ linux-2.4.35.4/drivers/char/decserial.c	2007-12-15 05:19:44.914980597 +0100
 @@ -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	2007-12-15 05:19:43.806917453 +0100
++++ linux-2.4.35.4/drivers/char/ds1286.c	2007-12-15 05:19:44.914980597 +0100
 @@ -1,6 +1,10 @@
  /*
   * DS1286 Real Time Clock interface for Linux
@@ -12780,9 +12916,10 @@ 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
+Index: linux-2.4.35.4/drivers/char/ds1742.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/ds1742.c	2007-12-15 05:19:43.814917908 +0100
++++ linux-2.4.35.4/drivers/char/ds1742.c	2007-12-15 05:19:44.918980826 +0100
 @@ -142,6 +142,7 @@
  	CMOS_WRITE(RTC_WRITE, RTC_CONTROL);
  
@@ -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	2007-12-15 05:19:43.822918363 +0100
++++ linux-2.4.35.4/drivers/char/dummy_keyb.c	2007-12-15 05:19:44.918980826 +0100
+@@ -141,3 +141,7 @@
  {
  	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	2007-12-15 05:19:43.826918593 +0100
++++ linux-2.4.35.4/drivers/char/dz.c	2007-12-15 05:19:44.918980826 +0100
 @@ -1,11 +1,13 @@
  /*
 - * dz.c: Serial port driver for DECStations equiped 
@@ -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	2007-12-15 05:19:43.834919048 +0100
++++ linux-2.4.35.4/drivers/char/dz.h	2007-12-15 05:19:44.918980826 +0100
 @@ -10,6 +10,8 @@
  #ifndef DZ_SERIAL_H
  #define DZ_SERIAL_H
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map	2007-12-15 05:19:44.922981052 +0100
 @@ -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	2007-12-15 05:19:43.846919732 +0100
++++ linux-2.4.35.4/drivers/char/indydog.c	2007-12-15 05:19:44.922981052 +0100
 @@ -1,5 +1,5 @@
  /*
 - *	IndyDog	0.2	A Hardware Watchdog Device for SGI IP22
@@ -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	2007-12-15 05:19:43.854920187 +0100
++++ linux-2.4.35.4/drivers/char/ip27-rtc.c	2007-12-15 05:19:44.922981052 +0100
 @@ -44,6 +44,7 @@
  #include <asm/sn/klconfig.h>
  #include <asm/sn/sn0/ip27.h>
@@ -14477,9 +14620,10 @@ 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
+Index: linux-2.4.35.4/drivers/char/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/Makefile	2007-12-15 05:19:43.862920643 +0100
++++ linux-2.4.35.4/drivers/char/Makefile	2007-12-15 05:19:44.922981052 +0100
 @@ -48,7 +48,12 @@
      KEYBD    =
    endif
@@ -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 @@
  
  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	2007-12-15 05:19:43.870921098 +0100
++++ linux-2.4.35.4/drivers/char/mips_rtc.c	2007-12-15 05:19:44.926981281 +0100
 @@ -53,14 +53,6 @@
  #include <asm/io.h>
  #include <asm/uaccess.h>
@@ -14546,9 +14691,10 @@ 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
+Index: linux-2.4.35.4/drivers/char/sb1250_duart.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/sb1250_duart.c	2007-12-15 05:19:43.874921327 +0100
++++ linux-2.4.35.4/drivers/char/sb1250_duart.c	2007-12-15 05:19:44.930981508 +0100
 @@ -328,10 +328,11 @@
  		if (c <= 0) break;
  
@@ -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	2007-12-15 05:19:43.882921783 +0100
++++ linux-2.4.35.4/drivers/char/serial.c	2007-12-15 05:19:44.934981737 +0100
 @@ -62,6 +62,12 @@
   *        Robert Schwebel <robert@schwebel.de>,
   *        Juergen Beisert <jbeisert@eurodsn.de>,
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map	2007-12-15 05:19:44.934981737 +0100
 @@ -0,0 +1,102 @@
 +# Victor Interlink MP-C303/304 keyboard keymap
 +#
@@ -14757,9 +14905,10 @@ 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
+Index: linux-2.4.35.4/drivers/char/vr41xx_keyb.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/vr41xx_keyb.c	2007-12-15 05:19:43.894922467 +0100
++++ linux-2.4.35.4/drivers/char/vr41xx_keyb.c	2007-12-15 05:19:44.938981966 +0100
 @@ -308,7 +308,7 @@
  			if (found != 0) {
  				kiu_base = VRC4173_KIU_OFFSET;
@@ -14778,9 +14927,10 @@ 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
+Index: linux-2.4.35.4/drivers/i2c/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/i2c/Config.in	2007-12-15 05:19:43.902922923 +0100
++++ linux-2.4.35.4/drivers/i2c/Config.in	2007-12-15 05:19:44.938981966 +0100
 @@ -57,6 +57,10 @@
     if [ "$CONFIG_SGI_IP22" = "y" ]; then
        dep_tristate 'I2C SGI interfaces' CONFIG_I2C_ALGO_SGI $CONFIG_I2C
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c	2007-12-15 05:19:44.938981966 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/i2c/i2c-au1550.c	2007-12-15 05:19:44.938981966 +0100
 @@ -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	2007-12-15 05:19:43.922924062 +0100
++++ linux-2.4.35.4/drivers/i2c/i2c-core.c	2007-12-15 05:19:44.938981966 +0100
+@@ -1277,6 +1277,9 @@
  #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 @@
  	i2c_max1617_init();
  #endif
  
@@ -15318,9 +15471,10 @@ 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
+Index: linux-2.4.35.4/drivers/i2c/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/i2c/Makefile	2007-12-15 05:19:43.930924518 +0100
++++ linux-2.4.35.4/drivers/i2c/Makefile	2007-12-15 05:19:44.942982192 +0100
 @@ -6,7 +6,7 @@
  
  export-objs	:= i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \
@@ -15338,9 +15492,10 @@ 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
+Index: linux-2.4.35.4/drivers/media/video/indycam.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/media/video/indycam.c	2007-12-15 05:19:43.934924747 +0100
++++ linux-2.4.35.4/drivers/media/video/indycam.c	2007-12-15 05:19:44.942982192 +0100
 @@ -50,13 +50,14 @@
  		0x80,			/* INDYCAM_GAMMA */
  	};
@@ -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	2007-12-15 05:19:43.946925431 +0100
++++ linux-2.4.35.4/drivers/media/video/vino.c	2007-12-15 05:19:44.950982647 +0100
 @@ -5,6 +5,8 @@
   * License version 2 as published by the Free Software Foundation.
   *
@@ -15513,9 +15669,10 @@ 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
+Index: linux-2.4.35.4/drivers/mtd/devices/docprobe.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/devices/docprobe.c	2007-12-15 05:19:43.954925886 +0100
++++ linux-2.4.35.4/drivers/mtd/devices/docprobe.c	2007-12-15 05:19:44.950982647 +0100
 @@ -89,10 +89,10 @@
  	0xe4000000,
  #elif defined(CONFIG_MOMENCO_OCELOT)
@@ -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	2007-12-15 05:19:43.958926116 +0100
++++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c	2007-12-15 05:19:44.950982647 +0100
 @@ -1,10 +1,10 @@
  /*
 - *      Copyright (c) 2001 Maciej W. Rozycki
@@ -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	2007-12-15 05:19:43.966926571 +0100
++++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h	2007-12-15 05:19:44.950982647 +0100
 @@ -1,32 +1,96 @@
  /*
 - *      Copyright (c) 2001 Maciej W. Rozycki
@@ -15715,9 +15874,10 @@ 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
+Index: linux-2.4.35.4/drivers/mtd/maps/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/maps/Config.in	2007-12-15 05:19:43.974927026 +0100
++++ linux-2.4.35.4/drivers/mtd/maps/Config.in	2007-12-15 05:19:44.950982647 +0100
 @@ -51,11 +51,26 @@
     dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
     dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c	2007-12-15 05:19:44.950982647 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c	2007-12-15 05:19:44.954982876 +0100
 @@ -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	2007-12-15 05:19:43.994928166 +0100
++++ linux-2.4.35.4/drivers/mtd/maps/lasat.c	2007-12-15 05:19:44.954982876 +0100
 @@ -1,15 +1,6 @@
  /*
   * Flash device on lasat 100 and 200 boards
@@ -16333,9 +16496,10 @@ 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
+Index: linux-2.4.35.4/drivers/mtd/maps/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/maps/Makefile	2007-12-15 05:19:43.998928395 +0100
++++ linux-2.4.35.4/drivers/mtd/maps/Makefile	2007-12-15 05:19:44.954982876 +0100
 @@ -52,7 +52,13 @@
  obj-$(CONFIG_MTD_PB1000)	+= pb1xxx-flash.o
  obj-$(CONFIG_MTD_PB1100)	+= pb1xxx-flash.o
@@ -16357,9 +16521,10 @@ diff -Nur linux-2.4.32-rc1/drivers/mtd/maps/Makefile linux-2.4.32-rc1.mips/drive
 +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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c	2007-12-15 05:19:44.954982876 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/mtd/maps/mtx-1.c	2007-12-15 05:19:44.954982876 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c	2007-12-15 05:19:44.958983106 +0100
 @@ -0,0 +1,270 @@
 +/*
 + * Flash memory access on Alchemy Pb1550 board
@@ -17014,9 +17181,10 @@ 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
+Index: linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/maps/pb1xxx-flash.c	2007-12-15 05:19:44.026929991 +0100
++++ linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c	2007-12-15 05:19:44.958983106 +0100
 @@ -192,6 +192,34 @@
  #else
  #error MTD_PB1500 define combo error /* should never happen */
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/mtd/maps/xxs1500.c	2007-12-15 05:19:44.958983106 +0100
 @@ -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	2007-12-15 05:19:44.042930901 +0100
++++ linux-2.4.35.4/drivers/net/defxx.c	2007-12-15 05:19:44.962983332 +0100
 @@ -10,24 +10,18 @@
   *
   * Abstract:
@@ -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");
  
  
-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	2007-12-15 05:19:44.050931357 +0100
++++ linux-2.4.35.4/drivers/net/defxx.h	2007-12-15 05:19:44.962983332 +0100
 @@ -12,17 +12,11 @@
   *   Contains all definitions specified by port specification and required
   *   by the defxx.c driver.
@@ -18176,9 +18347,10 @@ 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
+Index: linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/hamradio/hdlcdrv.c	2007-12-15 05:19:44.058931815 +0100
++++ linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c	2007-12-15 05:19:44.962983332 +0100
 @@ -587,6 +587,8 @@
  		return -EINVAL;
  	s = (struct hdlcdrv_state *)dev->priv;
@@ -18188,9 +18360,10 @@ 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
+Index: linux-2.4.35.4/drivers/net/irda/au1k_ir.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/irda/au1k_ir.c	2007-12-15 05:19:44.066932270 +0100
++++ linux-2.4.35.4/drivers/net/irda/au1k_ir.c	2007-12-15 05:19:44.966983561 +0100
 @@ -81,10 +81,6 @@
  
  #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	2007-12-15 05:19:44.074932725 +0100
++++ linux-2.4.35.4/drivers/net/sgiseeq.c	2007-12-15 05:19:44.966983561 +0100
 @@ -24,16 +24,16 @@
  #include <asm/io.h>
  #include <asm/system.h>
@@ -18355,9 +18529,10 @@ diff -Nur linux-2.4.32-rc1/drivers/net/sgiseeq.c linux-2.4.32-rc1.mips/drivers/n
 +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
+Index: linux-2.4.35.4/drivers/pci/pci.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/pci/pci.c	2007-12-15 05:19:44.082933181 +0100
++++ linux-2.4.35.4/drivers/pci/pci.c	2007-12-15 05:19:44.966983561 +0100
 @@ -1281,11 +1281,17 @@
  {
  	unsigned int buses;
@@ -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	2007-12-15 05:19:44.090933636 +0100
++++ linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c	2007-12-15 05:19:44.970983787 +0100
 @@ -1,6 +1,6 @@
  /*
   *
@@ -18459,9 +18635,10 @@ 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
+Index: linux-2.4.35.4/drivers/pcmcia/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/pcmcia/Config.in	2007-12-15 05:19:44.098934094 +0100
++++ linux-2.4.35.4/drivers/pcmcia/Config.in	2007-12-15 05:19:44.974984016 +0100
 @@ -30,16 +30,14 @@
        dep_tristate '  M8xx support' CONFIG_PCMCIA_M8XX $CONFIG_PCMCIA
     fi
@@ -18483,9 +18660,10 @@ 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
+Index: linux-2.4.35.4/drivers/pcmcia/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/pcmcia/Makefile	2007-12-15 05:19:44.106934550 +0100
++++ linux-2.4.35.4/drivers/pcmcia/Makefile	2007-12-15 05:19:44.974984016 +0100
 @@ -61,9 +61,18 @@
  
  obj-$(CONFIG_PCMCIA_AU1X00)			+= au1x00_ss.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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c	2007-12-15 05:19:44.978984245 +0100
 @@ -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	2007-12-15 05:19:44.122935460 +0100
++++ linux-2.4.35.4/drivers/scsi/NCR53C9x.h	2007-12-15 05:19:44.978984245 +0100
 @@ -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	2007-12-15 05:19:44.126935690 +0100
++++ linux-2.4.35.4/drivers/sound/au1550_i2s.c	2007-12-15 05:19:44.982984472 +0100
 @@ -41,6 +41,7 @@
   *  675 Mass Ave, Cambridge, MA 02139, USA.
   *
@@ -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	2007-12-15 05:19:44.134936145 +0100
++++ linux-2.4.35.4/drivers/sound/au1550_psc.c	2007-12-15 05:19:44.982984472 +0100
 @@ -30,6 +30,7 @@
   *  675 Mass Ave, Cambridge, MA 02139, USA.
   *
@@ -20458,9 +20640,10 @@ 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
+Index: linux-2.4.35.4/drivers/sound/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/sound/Config.in	2007-12-15 05:19:44.142936600 +0100
++++ linux-2.4.35.4/drivers/sound/Config.in	2007-12-15 05:19:44.982984472 +0100
 @@ -72,10 +72,15 @@
  if [ "$CONFIG_DDB5477" = "y" ]; then
      dep_tristate '  NEC Vrc5477 AC97 sound' CONFIG_SOUND_VRC5477 $CONFIG_SOUND
@@ -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	2007-12-15 05:19:44.150937056 +0100
++++ linux-2.4.35.4/drivers/tc/lk201.c	2007-12-15 05:19:44.986984701 +0100
 @@ -5,7 +5,7 @@
   * for more details.
   *
@@ -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	2007-12-15 05:19:44.158937514 +0100
++++ linux-2.4.35.4/drivers/tc/zs.c	2007-12-15 05:19:44.986984701 +0100
 @@ -68,6 +68,8 @@
  #include <asm/bitops.h>
  #include <asm/uaccess.h>
@@ -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	2007-12-15 05:19:44.166937969 +0100
++++ linux-2.4.35.4/drivers/tc/zs.h	2007-12-15 05:19:44.986984701 +0100
 @@ -1,14 +1,18 @@
  /*
 - * macserial.h: Definitions for the Macintosh Z8530 serial driver.
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/video/au1200fb.c	2007-12-15 05:19:44.990984927 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/video/au1200fb.h	2007-12-15 05:19:44.990984927 +0100
 @@ -0,0 +1,288 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -23123,9 +23311,10 @@ 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
+Index: linux-2.4.35.4/drivers/video/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/video/Config.in	2007-12-15 05:19:44.186939109 +0100
++++ linux-2.4.35.4/drivers/video/Config.in	2007-12-15 05:19:44.990984927 +0100
 @@ -87,8 +87,8 @@
     if [ "$CONFIG_HP300" = "y" ]; then
        define_bool CONFIG_FB_HP300 y
@@ -23165,9 +23354,10 @@ 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
+Index: linux-2.4.35.4/drivers/video/fbmem.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/video/fbmem.c	2007-12-15 05:19:44.194939564 +0100
++++ linux-2.4.35.4/drivers/video/fbmem.c	2007-12-15 05:19:44.994985156 +0100
 @@ -139,6 +139,8 @@
  extern int e1356fb_setup(char*);
  extern int au1100fb_init(void);
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/video/ims332.h	2007-12-15 05:19:44.994985156 +0100
 @@ -0,0 +1,275 @@
 +/*
 + *	linux/drivers/video/ims332.h
@@ -23466,9 +23657,10 @@ 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
+Index: linux-2.4.35.4/drivers/video/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/video/Makefile	2007-12-15 05:19:44.206940249 +0100
++++ linux-2.4.35.4/drivers/video/Makefile	2007-12-15 05:19:44.994985156 +0100
 @@ -87,6 +87,7 @@
  obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
  obj-$(CONFIG_FB_TX3912)           += tx3912fb.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	2007-12-15 05:19:44.214940704 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -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	2007-12-15 05:19:44.222941159 +0100
++++ linux-2.4.35.4/drivers/video/newport_con.c	2007-12-15 05:19:45.002985611 +0100
 @@ -22,6 +22,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -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	2007-12-15 05:19:44.230941615 +0100
++++ linux-2.4.35.4/drivers/video/tgafb.c	2007-12-15 05:19:45.002985611 +0100
 @@ -45,6 +45,15 @@
  #include <linux/console.h>
  #include <asm/io.h>
@@ -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	2007-12-15 05:19:44.238942073 +0100
++++ linux-2.4.35.4/drivers/video/tgafb.h	2007-12-15 05:19:45.002985611 +0100
 @@ -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	2007-12-15 05:19:44.246942528 +0100
++++ linux-2.4.35.4/fs/binfmt_elf.c	2007-12-15 05:19:45.006985841 +0100
+@@ -665,6 +665,9 @@
  		    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 @@
  	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	2007-12-15 05:19:44.254942983 +0100
++++ linux-2.4.35.4/fs/partitions/sgi.c	2007-12-15 05:19:45.006985841 +0100
 @@ -17,6 +17,11 @@
  #include "check.h"
  #include "sgi.h"
@@ -23996,9 +24194,10 @@ 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
+Index: linux-2.4.35.4/fs/proc/array.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/proc/array.c	2007-12-15 05:19:44.262943439 +0100
++++ linux-2.4.35.4/fs/proc/array.c	2007-12-15 05:19:45.006985841 +0100
 @@ -368,15 +368,15 @@
  		task->cmin_flt,
  		task->maj_flt,
@@ -24039,9 +24238,10 @@ 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
+Index: linux-2.4.35.4/fs/proc/proc_misc.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/proc/proc_misc.c	2007-12-15 05:19:44.270943894 +0100
++++ linux-2.4.35.4/fs/proc/proc_misc.c	2007-12-15 05:19:45.006985841 +0100
 @@ -308,16 +308,16 @@
  {
  	int i, len = 0;
@@ -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	2007-12-15 05:19:44.278944352 +0100
++++ linux-2.4.35.4/include/asm-alpha/param.h	2007-12-15 05:19:45.010986067 +0100
 @@ -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	2007-12-15 05:19:44.290945034 +0100
++++ linux-2.4.35.4/include/asm-i386/param.h	2007-12-15 05:19:45.010986067 +0100
 @@ -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	2007-12-15 05:19:44.298945492 +0100
++++ linux-2.4.35.4/include/asm-ia64/param.h	2007-12-15 05:19:45.010986067 +0100
 @@ -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	2007-12-15 05:19:44.306945948 +0100
++++ linux-2.4.35.4/include/asm-m68k/param.h	2007-12-15 05:19:45.010986067 +0100
 @@ -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	2007-12-15 05:19:44.314946403 +0100
++++ linux-2.4.35.4/include/asm-mips/au1000_gpio.h	2007-12-15 05:19:45.014986296 +0100
 @@ -30,6 +30,13 @@
   *  675 Mass Ave, Cambridge, MA 02139, USA.
   */
@@ -24255,9 +24460,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips/au1000.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/au1000.h	2007-12-15 05:19:44.322946858 +0100
++++ linux-2.4.35.4/include/asm-mips/au1000.h	2007-12-15 05:19:45.018986525 +0100
 @@ -160,28 +160,356 @@
  #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)
  #endif
@@ -24925,9 +25131,10 @@ diff -Nur linux-2.4.32-rc1/include/asm-mips/au1000.h linux-2.4.32-rc1.mips/inclu
 +
 +#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	2007-12-15 05:19:44.330947314 +0100
++++ linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h	2007-12-15 05:19:45.022986751 +0100
 @@ -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	2007-12-15 05:19:44.338947772 +0100
++++ linux-2.4.35.4/include/asm-mips/au1100_mmc.h	2007-12-15 05:19:45.022986751 +0100
 @@ -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	2007-12-15 05:19:44.342947998 +0100
++++ linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h	2007-12-15 05:19:45.022986751 +0100
 @@ -43,7 +43,7 @@
  #define DDMA_GLOBAL_BASE	0xb4003000
  #define DDMA_CHANNEL_BASE	0xb4002000
@@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h	2007-12-15 05:19:45.022986751 +0100
 @@ -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	2007-12-15 05:19:44.358948912 +0100
++++ linux-2.4.35.4/include/asm-mips/au1xxx_psc.h	2007-12-15 05:19:45.022986751 +0100
 @@ -41,6 +41,11 @@
  #define PSC3_BASE_ADDR		0xb0d00000
  #endif
@@ -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	2007-12-15 05:19:44.366949367 +0100
++++ linux-2.4.35.4/include/asm-mips/bootinfo.h	2007-12-15 05:19:45.026986980 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/asm-mips/db1200.h	2007-12-15 05:19:45.026986980 +0100
 @@ -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	2007-12-15 05:19:44.378950051 +0100
++++ linux-2.4.35.4/include/asm-mips/db1x00.h	2007-12-15 05:19:45.026986980 +0100
 @@ -1,5 +1,5 @@
  /*
 - * AMD Alchemy DB1x00 Reference Boards
@@ -25567,9 +25781,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips/elf.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/elf.h	2007-12-15 05:19:44.386950507 +0100
++++ linux-2.4.35.4/include/asm-mips/elf.h	2007-12-15 05:19:45.026986980 +0100
 @@ -66,9 +66,10 @@
  #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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/asm-mips/ficmmp.h	2007-12-15 05:19:45.026986980 +0100
 @@ -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	2007-12-15 05:19:44.398951191 +0100
++++ linux-2.4.35.4/include/asm-mips/hazards.h	2007-12-15 05:19:45.030987207 +0100
 @@ -3,7 +3,7 @@
   * License.  See the file "COPYING" in the main directory of this archive
   * for more details.
@@ -25963,9 +26180,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips/ide.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/ide.h	2007-12-15 05:19:44.406951647 +0100
++++ linux-2.4.35.4/include/asm-mips/ide.h	2007-12-15 05:19:45.030987207 +0100
 @@ -32,12 +32,12 @@
  
  extern struct ide_ops *ide_ops;
@@ -26081,9 +26299,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips/io.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/io.h	2007-12-15 05:19:44.414952102 +0100
++++ linux-2.4.35.4/include/asm-mips/io.h	2007-12-15 05:19:45.030987207 +0100
 @@ -392,7 +392,8 @@
  	return __ioswab32(__val);
  }
@@ -26114,9 +26333,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips/mipsregs.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/mipsregs.h	2007-12-15 05:19:44.422952557 +0100
++++ linux-2.4.35.4/include/asm-mips/mipsregs.h	2007-12-15 05:19:45.038987665 +0100
 @@ -757,10 +757,18 @@
  #define read_c0_config1()	__read_32bit_c0_register($16, 1)
  #define read_c0_config2()	__read_32bit_c0_register($16, 2)
@@ -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	2007-12-15 05:19:44.430953013 +0100
++++ linux-2.4.35.4/include/asm-mips/mmu_context.h	2007-12-15 05:19:45.038987665 +0100
 @@ -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	2007-12-15 05:19:44.438953471 +0100
++++ linux-2.4.35.4/include/asm-mips/pb1100.h	2007-12-15 05:19:45.038987665 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/asm-mips/pb1200.h	2007-12-15 05:19:45.038987665 +0100
 @@ -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	2007-12-15 05:19:44.450954152 +0100
++++ linux-2.4.35.4/include/asm-mips/pb1550.h	2007-12-15 05:19:45.042987891 +0100
 @@ -30,13 +30,11 @@
  
  #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX
@@ -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	2007-12-15 05:19:44.458954611 +0100
++++ linux-2.4.35.4/include/asm-mips/reg.h	2007-12-15 05:19:45.042987891 +0100
 @@ -45,6 +45,9 @@
  /*
   * k0/k1 unsaved
@@ -26675,9 +26900,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/sgi/hpc3.h	2007-12-15 05:19:44.466955066 +0100
++++ linux-2.4.35.4/include/asm-mips/sgi/hpc3.h	2007-12-15 05:19:45.042987891 +0100
 @@ -128,26 +128,26 @@
  	volatile u32 rx_gfptr;	/* current GIO fifo ptr */
  	volatile u32 rx_dfptr;	/* current device fifo ptr */
@@ -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	2007-12-15 05:19:44.474955521 +0100
++++ linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h	2007-12-15 05:19:45.042987891 +0100
 @@ -88,8 +88,8 @@
  
  
@@ -26814,9 +27041,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips/unistd.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/unistd.h	2007-12-15 05:19:44.482955977 +0100
++++ linux-2.4.35.4/include/asm-mips/unistd.h	2007-12-15 05:19:45.046988120 +0100
 @@ -760,7 +760,7 @@
  	if (__a3 == 0) \
  		return (type) __v0; \
@@ -26898,9 +27126,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips64/checksum.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/checksum.h	2007-12-15 05:19:44.490956432 +0100
++++ linux-2.4.35.4/include/asm-mips64/checksum.h	2007-12-15 05:19:45.046988120 +0100
 @@ -144,7 +144,7 @@
  	"daddu\t%0, %4\n\t"
  	"dsll32\t$1, %0, 0\n\t"
@@ -26910,9 +27139,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips64/elf.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/elf.h	2007-12-15 05:19:44.498956890 +0100
++++ linux-2.4.35.4/include/asm-mips64/elf.h	2007-12-15 05:19:45.046988120 +0100
 @@ -64,9 +64,10 @@
  #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	2007-12-15 05:19:44.506957346 +0100
++++ linux-2.4.35.4/include/asm-mips64/hazards.h	2007-12-15 05:19:45.046988120 +0100
 @@ -3,7 +3,7 @@
   * License.  See the file "COPYING" in the main directory of this archive
   * for more details.
@@ -27147,9 +27378,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips64/ide.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/ide.h	2007-12-15 05:19:44.514957801 +0100
++++ linux-2.4.35.4/include/asm-mips64/ide.h	2007-12-15 05:19:45.050988346 +0100
 @@ -32,12 +32,12 @@
  
  extern struct ide_ops *ide_ops;
@@ -27265,9 +27497,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips64/io.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/io.h	2007-12-15 05:19:44.522958256 +0100
++++ linux-2.4.35.4/include/asm-mips64/io.h	2007-12-15 05:19:45.050988346 +0100
 @@ -414,7 +414,8 @@
  	return __ioswab32(__val);
  }
@@ -27298,9 +27531,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips64/mipsregs.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/mipsregs.h	2007-12-15 05:19:44.530958712 +0100
++++ linux-2.4.35.4/include/asm-mips64/mipsregs.h	2007-12-15 05:19:45.050988346 +0100
 @@ -757,10 +757,18 @@
  #define read_c0_config1()	__read_32bit_c0_register($16, 1)
  #define read_c0_config2()	__read_32bit_c0_register($16, 2)
@@ -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	2007-12-15 05:19:44.538959170 +0100
++++ linux-2.4.35.4/include/asm-mips64/reg.h	2007-12-15 05:19:45.050988346 +0100
 @@ -46,6 +46,9 @@
  /*
   * k0/k1 unsaved
@@ -27376,9 +27611,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/sgi/hpc3.h	2007-12-15 05:19:44.546959625 +0100
++++ linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h	2007-12-15 05:19:45.050988346 +0100
 @@ -128,26 +128,26 @@
  	volatile u32 rx_gfptr;	/* current GIO fifo ptr */
  	volatile u32 rx_dfptr;	/* current device fifo ptr */
@@ -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	2007-12-15 05:19:44.554960080 +0100
++++ linux-2.4.35.4/include/asm-mips64/sn/nmi.h	2007-12-15 05:19:45.054988575 +0100
 @@ -8,7 +8,7 @@
  #ifndef __ASM_SN_NMI_H
  #define __ASM_SN_NMI_H
@@ -27456,9 +27693,10 @@ 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
+Index: linux-2.4.35.4/include/asm-mips64/unistd.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/unistd.h	2007-12-15 05:19:44.562960536 +0100
++++ linux-2.4.35.4/include/asm-mips64/unistd.h	2007-12-15 05:19:45.054988575 +0100
 @@ -760,7 +760,7 @@
  	if (__a3 == 0) \
  		return (type) __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	2007-12-15 05:19:44.570960991 +0100
++++ linux-2.4.35.4/include/asm-ppc/param.h	2007-12-15 05:19:45.054988575 +0100
 @@ -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	2007-12-15 05:19:44.578961449 +0100
++++ linux-2.4.35.4/include/asm-s390/param.h	2007-12-15 05:19:45.054988575 +0100
 @@ -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	2007-12-15 05:19:44.590962131 +0100
++++ linux-2.4.35.4/include/asm-sh/param.h	2007-12-15 05:19:45.054988575 +0100
 @@ -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	2007-12-15 05:19:44.598962589 +0100
++++ linux-2.4.35.4/include/asm-sparc/param.h	2007-12-15 05:19:45.058988805 +0100
 @@ -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	2007-12-15 05:19:44.606963045 +0100
++++ linux-2.4.35.4/include/asm-sparc64/param.h	2007-12-15 05:19:45.058988805 +0100
 @@ -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	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/i2c-algo-au1550.h	2007-12-15 05:19:45.058988805 +0100
 @@ -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	2007-12-15 05:19:44.618963729 +0100
++++ linux-2.4.35.4/include/linux/i2c-id.h	2007-12-15 05:19:45.062989031 +0100
+@@ -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,9 +27907,10 @@ 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
+Index: linux-2.4.35.4/include/linux/sched.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/sched.h	2007-12-15 05:19:44.626964184 +0100
++++ linux-2.4.35.4/include/linux/sched.h	2007-12-15 05:19:45.066989260 +0100
 @@ -617,6 +617,10 @@
  extern int in_group_p(gid_t);
  extern int in_egroup_p(gid_t);
@@ -27676,9 +27922,10 @@ 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
+Index: linux-2.4.35.4/include/linux/serial.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/serial.h	2007-12-15 05:19:44.634964640 +0100
++++ linux-2.4.35.4/include/linux/serial.h	2007-12-15 05:19:45.066989260 +0100
 @@ -75,7 +75,8 @@
  #define PORT_16654	11
  #define PORT_16850	12
@@ -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	2007-12-15 05:19:44.642965095 +0100
++++ linux-2.4.35.4/include/linux/swap.h	2007-12-15 05:19:45.066989260 +0100
 @@ -1,6 +1,12 @@
  #ifndef _LINUX_SWAP_H
  #define _LINUX_SWAP_H
@@ -27723,9 +27971,10 @@ 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
+Index: linux-2.4.35.4/include/video/newport.h
+===================================================================
+--- linux-2.4.35.4.orig/include/video/newport.h	2007-12-15 05:19:44.650965550 +0100
++++ linux-2.4.35.4/include/video/newport.h	2007-12-15 05:19:45.066989260 +0100
 @@ -291,8 +291,6 @@
  	unsigned int _unused2[0x1ef];
  	struct newport_cregs cgo;
@@ -27793,9 +28042,10 @@ 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
+Index: linux-2.4.35.4/init/main.c
+===================================================================
+--- linux-2.4.35.4.orig/init/main.c	2007-12-15 05:19:44.662966235 +0100
++++ linux-2.4.35.4/init/main.c	2007-12-15 05:19:45.070989486 +0100
 @@ -296,7 +296,6 @@
  
  
@@ -27804,9 +28054,10 @@ 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
+Index: linux-2.4.35.4/kernel/exit.c
+===================================================================
+--- linux-2.4.35.4.orig/kernel/exit.c	2007-12-15 05:19:44.666966464 +0100
++++ linux-2.4.35.4/kernel/exit.c	2007-12-15 05:19:45.070989486 +0100
 @@ -26,7 +26,7 @@
  
  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	2007-12-15 05:19:44.674966919 +0100
++++ linux-2.4.35.4/kernel/signal.c	2007-12-15 05:19:45.070989486 +0100
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/sched.h>
@@ -27888,9 +28140,10 @@ 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
+Index: linux-2.4.35.4/kernel/sys.c
+===================================================================
+--- linux-2.4.35.4.orig/kernel/sys.c	2007-12-15 05:19:44.682967375 +0100
++++ linux-2.4.35.4/kernel/sys.c	2007-12-15 05:19:45.074989715 +0100
 @@ -801,16 +801,23 @@
  
  asmlinkage long sys_times(struct tms * tbuf)
@@ -27918,9 +28171,10 @@ 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
+Index: linux-2.4.35.4/lib/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/lib/Makefile	2007-12-15 05:19:44.694968059 +0100
++++ linux-2.4.35.4/lib/Makefile	2007-12-15 05:19:45.074989715 +0100
 @@ -27,6 +27,7 @@
  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	2007-12-15 05:19:44.702968514 +0100
++++ linux-2.4.35.4/Makefile	2007-12-15 05:19:45.074989715 +0100
+@@ -469,10 +469,11 @@
  	$(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 @@
  	$(MAKE) -C Documentation/DocBook man
  
  sums:
diff --git a/target/linux/generic-2.4/patches/001-squashfs.patch b/target/linux/generic-2.4/patches/001-squashfs.patch
index b2d9cf3707..e6751fd1d0 100644
--- a/target/linux/generic-2.4/patches/001-squashfs.patch
+++ b/target/linux/generic-2.4/patches/001-squashfs.patch
@@ -1,7 +1,8 @@
-diff --new-file -urp linux-2.4.32/fs/Config.in linux-2.4.32-squashfs3.0/fs/Config.in
---- linux-2.4.32/fs/Config.in	2004-11-17 11:54:21.000000000 +0000
-+++ linux-2.4.32-squashfs3.0/fs/Config.in	2006-03-07 21:12:36.000000000 +0000
-@@ -51,6 +51,14 @@ if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFI
+Index: linux-2.4.35.4/fs/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/fs/Config.in	2007-12-15 05:19:42.758857728 +0100
++++ linux-2.4.35.4/fs/Config.in	2007-12-15 05:19:48.635192599 +0100
+@@ -51,6 +51,14 @@
     int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
  fi
  tristate 'Compressed ROM file system support' CONFIG_CRAMFS
@@ -16,10 +17,11 @@ diff --new-file -urp linux-2.4.32/fs/Config.in linux-2.4.32-squashfs3.0/fs/Confi
  bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
  define_bool CONFIG_RAMFS y
  
-diff --new-file -urp linux-2.4.32/fs/Makefile linux-2.4.32-squashfs3.0/fs/Makefile
---- linux-2.4.32/fs/Makefile	2004-02-18 13:36:31.000000000 +0000
-+++ linux-2.4.32-squashfs3.0/fs/Makefile	2006-03-07 21:12:36.000000000 +0000
-@@ -65,6 +65,7 @@ subdir-$(CONFIG_REISERFS_FS)	+= reiserfs
+Index: linux-2.4.35.4/fs/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/fs/Makefile	2007-12-15 05:19:42.766858183 +0100
++++ linux-2.4.35.4/fs/Makefile	2007-12-15 05:19:48.639192828 +0100
+@@ -65,6 +65,7 @@
  subdir-$(CONFIG_DEVPTS_FS)	+= devpts
  subdir-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs
  subdir-$(CONFIG_BEFS_FS)	+= befs
@@ -27,9 +29,10 @@ diff --new-file -urp linux-2.4.32/fs/Makefile linux-2.4.32-squashfs3.0/fs/Makefi
  subdir-$(CONFIG_JFS_FS)		+= jfs
  subdir-$(CONFIG_XFS_FS)		+= xfs
  
-diff --new-file -urp linux-2.4.32/fs/squashfs/inode.c linux-2.4.32-squashfs3.0/fs/squashfs/inode.c
---- linux-2.4.32/fs/squashfs/inode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-squashfs3.0/fs/squashfs/inode.c	2006-03-07 21:12:36.000000000 +0000
+Index: linux-2.4.35.4/fs/squashfs/inode.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/squashfs/inode.c	2007-12-15 05:19:48.647193283 +0100
 @@ -0,0 +1,2028 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -2059,9 +2062,10 @@ diff --new-file -urp linux-2.4.32/fs/squashfs/inode.c linux-2.4.32-squashfs3.0/f
 +MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
 +MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
 +MODULE_LICENSE("GPL");
-diff --new-file -urp linux-2.4.32/fs/squashfs/Makefile linux-2.4.32-squashfs3.0/fs/squashfs/Makefile
---- linux-2.4.32/fs/squashfs/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-squashfs3.0/fs/squashfs/Makefile	2006-03-07 21:12:36.000000000 +0000
+Index: linux-2.4.35.4/fs/squashfs/Makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/squashfs/Makefile	2007-12-15 05:19:48.651193513 +0100
 @@ -0,0 +1,11 @@
 +#
 +# Makefile for the linux squashfs routines.
@@ -2074,9 +2078,10 @@ diff --new-file -urp linux-2.4.32/fs/squashfs/Makefile linux-2.4.32-squashfs3.0/
 +obj-m := $(O_TARGET)
 +
 +include $(TOPDIR)/Rules.make
-diff --new-file -urp linux-2.4.32/fs/squashfs/squashfs2_0.c linux-2.4.32-squashfs3.0/fs/squashfs/squashfs2_0.c
---- linux-2.4.32/fs/squashfs/squashfs2_0.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-squashfs3.0/fs/squashfs/squashfs2_0.c	2006-03-07 21:12:36.000000000 +0000
+Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/squashfs/squashfs2_0.c	2007-12-15 05:19:48.655193739 +0100
 @@ -0,0 +1,751 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -2829,9 +2834,10 @@ diff --new-file -urp linux-2.4.32/fs/squashfs/squashfs2_0.c linux-2.4.32-squashf
 +
 +	return 1;
 +}
-diff --new-file -urp linux-2.4.32/fs/squashfs/squashfs.h linux-2.4.32-squashfs3.0/fs/squashfs/squashfs.h
---- linux-2.4.32/fs/squashfs/squashfs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-squashfs3.0/fs/squashfs/squashfs.h	2006-03-07 21:12:36.000000000 +0000
+Index: linux-2.4.35.4/fs/squashfs/squashfs.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/squashfs/squashfs.h	2007-12-15 05:19:48.659193968 +0100
 @@ -0,0 +1,85 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -2918,10 +2924,11 @@ diff --new-file -urp linux-2.4.32/fs/squashfs/squashfs.h linux-2.4.32-squashfs3.
 +	return 0;
 +}
 +#endif
-diff --new-file -urp linux-2.4.32/include/linux/fs.h linux-2.4.32-squashfs3.0/include/linux/fs.h
---- linux-2.4.32/include/linux/fs.h	2005-04-04 02:42:20.000000000 +0100
-+++ linux-2.4.32-squashfs3.0/include/linux/fs.h	2006-03-07 21:12:36.000000000 +0000
-@@ -324,6 +324,7 @@ extern void set_bh_page(struct buffer_he
+Index: linux-2.4.35.4/include/linux/fs.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/fs.h	2007-12-15 05:19:42.794859778 +0100
++++ linux-2.4.35.4/include/linux/fs.h	2007-12-15 05:19:48.663194197 +0100
+@@ -324,6 +324,7 @@
  #include <linux/usbdev_fs_i.h>
  #include <linux/jffs2_fs_i.h>
  #include <linux/cramfs_fs_sb.h>
@@ -2929,7 +2936,7 @@ diff --new-file -urp linux-2.4.32/include/linux/fs.h linux-2.4.32-squashfs3.0/in
  
  /*
   * Attribute flags.  These should be or-ed together to figure out what
-@@ -519,6 +520,7 @@ struct inode {
+@@ -519,6 +520,7 @@
  		struct socket			socket_i;
  		struct usbdev_inode_info        usbdev_i;
  		struct jffs2_inode_info		jffs2_i;
@@ -2937,7 +2944,7 @@ diff --new-file -urp linux-2.4.32/include/linux/fs.h linux-2.4.32-squashfs3.0/in
  		void				*generic_ip;
  	} u;
  };
-@@ -734,6 +736,7 @@ struct nameidata {
+@@ -734,6 +736,7 @@
  #include <linux/usbdev_fs_sb.h>
  #include <linux/cramfs_fs_sb.h>
  #include <linux/jffs2_fs_sb.h>
@@ -2945,7 +2952,7 @@ diff --new-file -urp linux-2.4.32/include/linux/fs.h linux-2.4.32-squashfs3.0/in
  
  extern struct list_head super_blocks;
  extern spinlock_t sb_lock;
-@@ -793,6 +796,7 @@ struct super_block {
+@@ -793,6 +796,7 @@
  		struct usbdev_sb_info   usbdevfs_sb;
  		struct jffs2_sb_info	jffs2_sb;
  		struct cramfs_sb_info	cramfs_sb;
@@ -2953,9 +2960,10 @@ diff --new-file -urp linux-2.4.32/include/linux/fs.h linux-2.4.32-squashfs3.0/in
  		void			*generic_sbp;
  	} u;
  	/*
-diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs.h linux-2.4.32-squashfs3.0/include/linux/squashfs_fs.h
---- linux-2.4.32/include/linux/squashfs_fs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-squashfs3.0/include/linux/squashfs_fs.h	2006-03-07 21:12:36.000000000 +0000
+Index: linux-2.4.35.4/include/linux/squashfs_fs.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/squashfs_fs.h	2007-12-15 05:19:48.663194197 +0100
 @@ -0,0 +1,915 @@
 +#ifndef SQUASHFS_FS
 +#define SQUASHFS_FS
@@ -3872,9 +3880,10 @@ diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs.h linux-2.4.32-squas
 +
 +#endif
 +#endif
-diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs_i.h linux-2.4.32-squashfs3.0/include/linux/squashfs_fs_i.h
---- linux-2.4.32/include/linux/squashfs_fs_i.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-squashfs3.0/include/linux/squashfs_fs_i.h	2006-03-07 21:12:36.000000000 +0000
+Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/squashfs_fs_i.h	2007-12-15 05:19:48.663194197 +0100
 @@ -0,0 +1,44 @@
 +#ifndef SQUASHFS_FS_I
 +#define SQUASHFS_FS_I
@@ -3920,9 +3929,10 @@ diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs_i.h linux-2.4.32-squ
 +	} u;
 +};
 +#endif
-diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs_sb.h linux-2.4.32-squashfs3.0/include/linux/squashfs_fs_sb.h
---- linux-2.4.32/include/linux/squashfs_fs_sb.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-squashfs3.0/include/linux/squashfs_fs_sb.h	2006-03-07 21:12:36.000000000 +0000
+Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/squashfs_fs_sb.h	2007-12-15 05:19:48.667194423 +0100
 @@ -0,0 +1,74 @@
 +#ifndef SQUASHFS_FS_SB
 +#define SQUASHFS_FS_SB
@@ -3998,9 +4008,10 @@ diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs_sb.h linux-2.4.32-sq
 +	int			(*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif
-diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init/do_mounts.c
---- linux-2.4.32/init/do_mounts.c	2003-11-28 18:26:21.000000000 +0000
-+++ linux-2.4.32-squashfs3.0/init/do_mounts.c	2006-03-07 21:12:36.000000000 +0000
+Index: linux-2.4.35.4/init/do_mounts.c
+===================================================================
+--- linux-2.4.35.4.orig/init/do_mounts.c	2007-12-15 05:19:42.822861373 +0100
++++ linux-2.4.35.4/init/do_mounts.c	2007-12-15 05:19:48.667194423 +0100
 @@ -15,6 +15,7 @@
  #include <linux/minix_fs.h>
  #include <linux/ext2_fs.h>
@@ -4009,7 +4020,7 @@ diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init
  #include <linux/cramfs_fs.h>
  
  #define BUILD_CRAMDISK
-@@ -476,6 +477,7 @@ static int __init crd_load(int in_fd, in
+@@ -476,6 +477,7 @@
   * 	minix
   * 	ext2
   *	romfs
@@ -4017,7 +4028,7 @@ diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init
   *	cramfs
   * 	gzip
   */
-@@ -486,6 +488,7 @@ identify_ramdisk_image(int fd, int start
+@@ -486,6 +488,7 @@
  	struct minix_super_block *minixsb;
  	struct ext2_super_block *ext2sb;
  	struct romfs_super_block *romfsb;
@@ -4025,7 +4036,7 @@ diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init
  	struct cramfs_super *cramfsb;
  	int nblocks = -1;
  	unsigned char *buf;
-@@ -497,6 +500,7 @@ identify_ramdisk_image(int fd, int start
+@@ -497,6 +500,7 @@
  	minixsb = (struct minix_super_block *) buf;
  	ext2sb = (struct ext2_super_block *) buf;
  	romfsb = (struct romfs_super_block *) buf;
@@ -4033,7 +4044,7 @@ diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init
  	cramfsb = (struct cramfs_super *) buf;
  	memset(buf, 0xe5, size);
  
-@@ -535,6 +539,15 @@ identify_ramdisk_image(int fd, int start
+@@ -535,6 +539,15 @@
  		goto done;
  	}
  
@@ -4049,10 +4060,11 @@ diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init
  	/*
  	 * Read block 1 to test for minix and ext2 superblock
  	 */
-diff --new-file -urp linux-2.4.32/lib/Config.in linux-2.4.32-squashfs3.0/lib/Config.in
---- linux-2.4.32/lib/Config.in	2003-11-28 18:26:21.000000000 +0000
-+++ linux-2.4.32-squashfs3.0/lib/Config.in	2006-03-07 21:12:36.000000000 +0000
-@@ -10,6 +10,7 @@ tristate 'CRC32 functions' CONFIG_CRC32
+Index: linux-2.4.35.4/lib/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/lib/Config.in	2007-12-15 05:19:42.830861829 +0100
++++ linux-2.4.35.4/lib/Config.in	2007-12-15 05:19:48.667194423 +0100
+@@ -10,6 +10,7 @@
  # Do we need the compression support?
  #
  if [ "$CONFIG_CRAMFS" = "y" -o \
@@ -4060,7 +4072,7 @@ diff --new-file -urp linux-2.4.32/lib/Config.in linux-2.4.32-squashfs3.0/lib/Con
       "$CONFIG_PPP_DEFLATE" = "y" -o \
       "$CONFIG_CRYPTO_DEFLATE" = "y" -o \
       "$CONFIG_JFFS2_FS" = "y" -o \
-@@ -17,6 +18,7 @@ if [ "$CONFIG_CRAMFS" = "y" -o \
+@@ -17,6 +18,7 @@
     define_tristate CONFIG_ZLIB_INFLATE y
  else
    if [ "$CONFIG_CRAMFS" = "m" -o \
diff --git a/target/linux/generic-2.4/patches/002-squashfs_lzma.patch b/target/linux/generic-2.4/patches/002-squashfs_lzma.patch
index d534154871..82bb91aaef 100644
--- a/target/linux/generic-2.4/patches/002-squashfs_lzma.patch
+++ b/target/linux/generic-2.4/patches/002-squashfs_lzma.patch
@@ -1,6 +1,7 @@
-diff -Nur linux-2.4.32/fs/squashfs/inode.c linux-2.4.32-owrt/fs/squashfs/inode.c
---- linux-2.4.32/fs/squashfs/inode.c	2006-03-21 13:06:10.000000000 +0100
-+++ linux-2.4.32-owrt/fs/squashfs/inode.c	2006-03-21 13:12:07.000000000 +0100
+Index: linux-2.4.35.4/fs/squashfs/inode.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/squashfs/inode.c	2007-12-15 05:19:48.647193283 +0100
++++ linux-2.4.35.4/fs/squashfs/inode.c	2007-12-15 05:19:49.015214255 +0100
 @@ -4,6 +4,9 @@
   * Copyright (c) 2002, 2003, 2004, 2005, 2006
   * Phillip Lougher <phillip@lougher.org.uk>
@@ -98,9 +99,10 @@ diff -Nur linux-2.4.32/fs/squashfs/inode.c linux-2.4.32-owrt/fs/squashfs/inode.c
  	unregister_filesystem(&squashfs_fs_type);
  }
  
-diff -Nur linux-2.4.32/fs/squashfs/LzmaDecode.c linux-2.4.32-owrt/fs/squashfs/LzmaDecode.c
---- linux-2.4.32/fs/squashfs/LzmaDecode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-owrt/fs/squashfs/LzmaDecode.c	2006-03-21 13:06:33.000000000 +0100
+Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/squashfs/LzmaDecode.c	2007-12-15 05:19:49.019214484 +0100
 @@ -0,0 +1,663 @@
 +/*
 +  LzmaDecode.c
@@ -765,9 +767,10 @@ diff -Nur linux-2.4.32/fs/squashfs/LzmaDecode.c linux-2.4.32-owrt/fs/squashfs/Lz
 +  *outSizeProcessed = nowPos;
 +  return LZMA_RESULT_OK;
 +}
-diff -Nur linux-2.4.32/fs/squashfs/LzmaDecode.h linux-2.4.32-owrt/fs/squashfs/LzmaDecode.h
---- linux-2.4.32/fs/squashfs/LzmaDecode.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32-owrt/fs/squashfs/LzmaDecode.h	2006-03-21 13:06:33.000000000 +0100
+Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/squashfs/LzmaDecode.h	2007-12-15 05:19:49.027214939 +0100
 @@ -0,0 +1,100 @@
 +/* 
 +  LzmaDecode.h
@@ -869,9 +872,10 @@ diff -Nur linux-2.4.32/fs/squashfs/LzmaDecode.h linux-2.4.32-owrt/fs/squashfs/Lz
 +    UInt32 *outSizeProcessed);
 +
 +#endif
-diff -Nur linux-2.4.32/fs/squashfs/Makefile linux-2.4.32-owrt/fs/squashfs/Makefile
---- linux-2.4.32/fs/squashfs/Makefile	2006-03-21 13:06:10.000000000 +0100
-+++ linux-2.4.32-owrt/fs/squashfs/Makefile	2006-03-21 13:12:39.000000000 +0100
+Index: linux-2.4.35.4/fs/squashfs/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/fs/squashfs/Makefile	2007-12-15 05:19:48.651193513 +0100
++++ linux-2.4.35.4/fs/squashfs/Makefile	2007-12-15 05:19:49.031215169 +0100
 @@ -4,7 +4,7 @@
  
  O_TARGET := squashfs.o
diff --git a/target/linux/generic-2.4/patches/003-jffs2_compression.patch b/target/linux/generic-2.4/patches/003-jffs2_compression.patch
index 56c5b3cbc0..bb2d03c7b8 100644
--- a/target/linux/generic-2.4/patches/003-jffs2_compression.patch
+++ b/target/linux/generic-2.4/patches/003-jffs2_compression.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-mips-cvs/Documentation/Configure.help linux-mips/Documentation/Configure.help
---- linux-mips-cvs/Documentation/Configure.help	2005-01-20 03:19:21.000000000 +0100
-+++ linux-mips/Documentation/Configure.help	2005-02-07 05:08:35.000000000 +0100
-@@ -17528,6 +17528,32 @@
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:19:42.546845646 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:19:49.287229757 +0100
+@@ -17580,6 +17580,32 @@
    If reporting bugs, please try to have available a full dump of the
    messages at debug level 1 while the misbehaviour was occurring.
  
@@ -34,9 +35,10 @@ diff -Nur linux-mips-cvs/Documentation/Configure.help linux-mips/Documentation/C
  JFFS stats available in /proc filesystem
  CONFIG_JFFS_PROC_FS
    Enabling this option will cause statistics from mounted JFFS file systems
-diff -Nur linux-mips-cvs/fs/Config.in linux-mips/fs/Config.in
---- linux-mips-cvs/fs/Config.in	2004-11-19 01:28:47.000000000 +0100
-+++ linux-mips/fs/Config.in	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/fs/Config.in	2007-12-15 05:19:48.635192599 +0100
++++ linux-2.4.35.4/fs/Config.in	2007-12-15 05:19:49.287229757 +0100
 @@ -50,6 +50,12 @@
  if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFIG_JFFS2_FS" = "m" ] ; then
     int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
@@ -48,20 +50,22 @@ diff -Nur linux-mips-cvs/fs/Config.in linux-mips/fs/Config.in
 +dep_mbool '  LZSS compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZSS $CONFIG_JFFS2_FS
 +
  tristate 'Compressed ROM file system support' CONFIG_CRAMFS
- bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
- define_bool CONFIG_RAMFS y
-diff -Nur linux-mips-cvs/fs/jffs2/Config.in.bbc.inc linux-mips/fs/jffs2/Config.in.bbc.inc
---- linux-mips-cvs/fs/jffs2/Config.in.bbc.inc	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/Config.in.bbc.inc	2005-02-07 05:08:34.000000000 +0100
+ tristate 'Squashed file system support' CONFIG_SQUASHFS
+ if [ "$CONFIG_SQUASHFS" = "y" -o "$CONFIG_SQUASHFS" = "m" ] ; then
+Index: linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc	2007-12-15 05:19:49.295230212 +0100
 @@ -0,0 +1,5 @@
 +dep_mbool '  ARMLIB compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_ARMLIB $CONFIG_JFFS2_FS
 +dep_mbool '  LZO1X-* compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZO $CONFIG_JFFS2_FS
 +dep_mbool '  LZARI compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZARI $CONFIG_JFFS2_FS
 +dep_mbool '  LZHD compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZHD $CONFIG_JFFS2_FS
 +dep_mbool '  LZSS compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZSS $CONFIG_JFFS2_FS
-diff -Nur linux-mips-cvs/fs/jffs2/Configure.help.bbc.inc linux-mips/fs/jffs2/Configure.help.bbc.inc
---- linux-mips-cvs/fs/jffs2/Configure.help.bbc.inc	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/Configure.help.bbc.inc	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc	2007-12-15 05:19:49.299230441 +0100
 @@ -0,0 +1,25 @@
 +ARMLIB compression support for BBC (EXPERIMENTAL)
 +CONFIG_JFFS2_BBC_ARMLIB
@@ -88,9 +92,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/Configure.help.bbc.inc linux-mips/fs/jffs2/Con
 +  This enables simple LempelZiv-Storer-Szymanski compression for BBC
 +  (faster than LZHD, and, and has a not-so-good compression ratio,
 +  was included just for testing)
-diff -Nur linux-mips-cvs/fs/jffs2/Kconfig.bbc.inc linux-mips/fs/jffs2/Kconfig.bbc.inc
---- linux-mips-cvs/fs/jffs2/Kconfig.bbc.inc	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/Kconfig.bbc.inc	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc	2007-12-15 05:19:49.303230670 +0100
 @@ -0,0 +1,40 @@
 +config JFFS2_BBC_ARMLIB
 +	bool "ARMLIB compression support for BBC (EXPERIMENTAL)"
@@ -132,9 +137,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/Kconfig.bbc.inc linux-mips/fs/jffs2/Kconfig.bb
 +	  This enables simple LempelZiv-Storer-Szymanski compression for BBC
 +	  (faster than LZHD, and, and has a not-so-good compression ratio,
 +	  was included just for testing)
-diff -Nur linux-mips-cvs/fs/jffs2/Makefile linux-mips/fs/jffs2/Makefile
---- linux-mips-cvs/fs/jffs2/Makefile	2003-08-13 19:19:25.000000000 +0200
-+++ linux-mips/fs/jffs2/Makefile	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/fs/jffs2/Makefile	2007-12-15 05:19:42.578847470 +0100
++++ linux-2.4.35.4/fs/jffs2/Makefile	2007-12-15 05:19:49.307230896 +0100
 @@ -10,9 +10,23 @@
  # Note 2! The CFLAGS definitions are now in the main makefile...
  
@@ -159,9 +165,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/Makefile linux-mips/fs/jffs2/Makefile
  	read.o nodemgmt.o readinode.o super.o write.o scan.o gc.o \
  	symlink.o build.o erase.o background.o
  
-diff -Nur linux-mips-cvs/fs/jffs2/Makefile.bbc.inc linux-mips/fs/jffs2/Makefile.bbc.inc
---- linux-mips-cvs/fs/jffs2/Makefile.bbc.inc	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/Makefile.bbc.inc	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc	2007-12-15 05:19:49.307230896 +0100
 @@ -0,0 +1,12 @@
 +JFFS2_BBC_KERNEL_OBJS-y = jffs2_bbc_framework.o jffs2_bbc_fs.o
 +
@@ -175,9 +182,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/Makefile.bbc.inc linux-mips/fs/jffs2/Makefile.
 +
 +JFFS2_BBC_MKFS_OBJS   = jffs2_bbc_mkfs.o jffs2_bbc_framework.o jffs2_bbc_armlib_comp.o jffs2_bbc_lzo_comp.o\
 +                        jffs2_bbc_lzss_comp.o jffs2_bbc_lzari_comp.o jffs2_bbc_lzhd_comp.o
-diff -Nur linux-mips-cvs/fs/jffs2/compr_zlib.c linux-mips/fs/jffs2/compr_zlib.c
---- linux-mips-cvs/fs/jffs2/compr_zlib.c	2003-01-11 18:53:17.000000000 +0100
-+++ linux-mips/fs/jffs2/compr_zlib.c	2005-02-07 05:08:35.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/jffs2/compr_zlib.c	2007-12-15 05:19:42.590848151 +0100
++++ linux-2.4.35.4/fs/jffs2/compr_zlib.c	2007-12-15 05:19:49.307230896 +0100
 @@ -85,7 +85,7 @@
  	vfree(inflate_workspace);
  }
@@ -216,9 +224,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/compr_zlib.c linux-mips/fs/jffs2/compr_zlib.c
 +		jffs2_zlib_decompress(data_in,cpage_out,srclen,destlen);
 +}
 +
-diff -Nur linux-mips-cvs/fs/jffs2/file.c linux-mips/fs/jffs2/file.c
---- linux-mips-cvs/fs/jffs2/file.c	2003-11-17 02:07:44.000000000 +0100
-+++ linux-mips/fs/jffs2/file.c	2005-02-07 05:08:35.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/file.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/jffs2/file.c	2007-12-15 05:19:42.594848380 +0100
++++ linux-2.4.35.4/fs/jffs2/file.c	2007-12-15 05:19:49.307230896 +0100
 @@ -35,6 +35,7 @@
   *
   */
@@ -235,9 +244,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/file.c linux-mips/fs/jffs2/file.c
  			comprtype = jffs2_compress(page_address(pg)+ (file_ofs & (PAGE_CACHE_SIZE-1)), comprbuf, &datalen, &cdatalen);
  		}
  		if (comprtype == JFFS2_COMPR_NONE) {
-diff -Nur linux-mips-cvs/fs/jffs2/gc.c linux-mips/fs/jffs2/gc.c
---- linux-mips-cvs/fs/jffs2/gc.c	2003-11-17 02:07:44.000000000 +0100
-+++ linux-mips/fs/jffs2/gc.c	2005-02-07 05:08:35.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/gc.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/jffs2/gc.c	2007-12-15 05:19:42.602848836 +0100
++++ linux-2.4.35.4/fs/jffs2/gc.c	2007-12-15 05:19:49.311231126 +0100
 @@ -35,6 +35,7 @@
   *
   */
@@ -254,9 +264,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/gc.c linux-mips/fs/jffs2/gc.c
  			comprtype = jffs2_compress(writebuf, comprbuf, &datalen, &cdatalen);
  		}
  		if (comprtype) {
-diff -Nur linux-mips-cvs/fs/jffs2/hpatch linux-mips/fs/jffs2/hpatch
---- linux-mips-cvs/fs/jffs2/hpatch	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/hpatch	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/hpatch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/hpatch	2007-12-15 05:19:49.311231126 +0100
 @@ -0,0 +1,191 @@
 +#!/usr/bin/perl
 +# A patch-like utility
@@ -449,9 +460,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/hpatch linux-mips/fs/jffs2/hpatch
 +}
 +file_end();
 +close(CMD);
-diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_armlib_comp.c linux-mips/fs/jffs2/jffs2_bbc_armlib_comp.c
---- linux-mips-cvs/fs/jffs2/jffs2_bbc_armlib_comp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/jffs2_bbc_armlib_comp.c	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c	2007-12-15 05:19:49.311231126 +0100
 @@ -0,0 +1,2224 @@
 +/*
 + * JFFS2-BBC: armlib compressor plugin
@@ -2677,9 +2689,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_armlib_comp.c linux-mips/fs/jffs2/jf
 +}
 +
 +/*END OF ARMLIB*/
-diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_framework.c linux-mips/fs/jffs2/jffs2_bbc_framework.c
---- linux-mips-cvs/fs/jffs2/jffs2_bbc_framework.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/jffs2_bbc_framework.c	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c	2007-12-15 05:19:49.315231352 +0100
 @@ -0,0 +1,1324 @@
 +/* 
 + * JFFS2-BBC: Compression Framework
@@ -4005,9 +4018,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_framework.c linux-mips/fs/jffs2/jffs
 +}
 +
 +#endif
-diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_framework.h linux-mips/fs/jffs2/jffs2_bbc_framework.h
---- linux-mips-cvs/fs/jffs2/jffs2_bbc_framework.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/jffs2_bbc_framework.h	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h	2007-12-15 05:19:49.315231352 +0100
 @@ -0,0 +1,202 @@
 +/*
 + * JFFS2-BBC: Compression Framework - headers
@@ -4211,9 +4225,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_framework.h linux-mips/fs/jffs2/jffs
 +int jffs2_bbc_get_memory_counter(void);
 +
 +#endif
-diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_fs.c linux-mips/fs/jffs2/jffs2_bbc_fs.c
---- linux-mips-cvs/fs/jffs2/jffs2_bbc_fs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/jffs2_bbc_fs.c	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c	2007-12-15 05:19:49.315231352 +0100
 @@ -0,0 +1,331 @@
 +/*
 + * JFFS2-BBC: File System Extension for Linux Kernel
@@ -4546,9 +4561,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_fs.c linux-mips/fs/jffs2/jffs2_bbc_f
 +	jffs2_bbc_compressor_deinit();
 +	remove_proc_entry("jffs2_bbc", NULL);
 +}
-diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_fs.h linux-mips/fs/jffs2/jffs2_bbc_fs.h
---- linux-mips-cvs/fs/jffs2/jffs2_bbc_fs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/jffs2_bbc_fs.h	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h	2007-12-15 05:19:49.315231352 +0100
 @@ -0,0 +1,30 @@
 +/*
 + * JFFS2 BBC: File System Extension for Linux Kernel - headers
@@ -4580,9 +4596,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_fs.h linux-mips/fs/jffs2/jffs2_bbc_f
 +
 +void jffs2_bbc_proc_init(void);
 +void jffs2_bbc_proc_deinit(void);
-diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzari_comp.c linux-mips/fs/jffs2/jffs2_bbc_lzari_comp.c
---- linux-mips-cvs/fs/jffs2/jffs2_bbc_lzari_comp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/jffs2_bbc_lzari_comp.c	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c	2007-12-15 05:19:49.319231581 +0100
 @@ -0,0 +1,788 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 +
@@ -5372,9 +5389,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzari_comp.c linux-mips/fs/jffs2/jff
 +{
 +	jffs2_bbc_unregister_compressor (&jffs2_bbc_lzari);
 +}
-diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzhd_comp.c linux-mips/fs/jffs2/jffs2_bbc_lzhd_comp.c
---- linux-mips-cvs/fs/jffs2/jffs2_bbc_lzhd_comp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/jffs2_bbc_lzhd_comp.c	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c	2007-12-15 05:19:49.319231581 +0100
 @@ -0,0 +1,747 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 +
@@ -6123,9 +6141,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzhd_comp.c linux-mips/fs/jffs2/jffs
 +{
 +	jffs2_bbc_unregister_compressor (&jffs2_bbc_lzhd);
 +}
-diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzo_comp.c linux-mips/fs/jffs2/jffs2_bbc_lzo_comp.c
---- linux-mips-cvs/fs/jffs2/jffs2_bbc_lzo_comp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/jffs2_bbc_lzo_comp.c	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c	2007-12-15 05:19:49.323231810 +0100
 @@ -0,0 +1,2435 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 +
@@ -8562,9 +8581,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzo_comp.c linux-mips/fs/jffs2/jffs2
 +{
 +	jffs2_bbc_unregister_compressor (&jffs2_bbc_lzo);
 +}
-diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzss_comp.c linux-mips/fs/jffs2/jffs2_bbc_lzss_comp.c
---- linux-mips-cvs/fs/jffs2/jffs2_bbc_lzss_comp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/jffs2_bbc_lzss_comp.c	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c	2007-12-15 05:19:49.323231810 +0100
 @@ -0,0 +1,385 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 +
@@ -8951,9 +8971,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzss_comp.c linux-mips/fs/jffs2/jffs
 +{
 +	jffs2_bbc_unregister_compressor (&jffs2_bbc_lzss);
 +}
-diff -Nur linux-mips-cvs/fs/jffs2/linux-2.4.25.hpatch linux-mips/fs/jffs2/linux-2.4.25.hpatch
---- linux-mips-cvs/fs/jffs2/linux-2.4.25.hpatch	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/fs/jffs2/linux-2.4.25.hpatch	2005-02-07 05:08:34.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch	2007-12-15 05:19:49.323231810 +0100
 @@ -0,0 +1,97 @@
 +FMakefile
 +=BBC insertion
@@ -9052,9 +9073,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/linux-2.4.25.hpatch linux-mips/fs/jffs2/linux-
 +?{
 ++	jffs2_bbc_proc_deinit(); /**BBC**/
 ++
-diff -Nur linux-mips-cvs/fs/jffs2/read.c linux-mips/fs/jffs2/read.c
---- linux-mips-cvs/fs/jffs2/read.c	2003-11-17 02:07:44.000000000 +0100
-+++ linux-mips/fs/jffs2/read.c	2005-02-07 05:08:35.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/read.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/jffs2/read.c	2007-12-15 05:19:42.666852484 +0100
++++ linux-2.4.35.4/fs/jffs2/read.c	2007-12-15 05:19:49.323231810 +0100
 @@ -35,6 +35,7 @@
   *
   */
@@ -9071,9 +9093,10 @@ diff -Nur linux-mips-cvs/fs/jffs2/read.c linux-mips/fs/jffs2/read.c
  		ret = jffs2_decompress(ri->compr, readbuf, decomprbuf, ri->csize, ri->dsize);
  		if (ret) {
  			printk(KERN_WARNING "Error: jffs2_decompress returned %d\n", ret);
-diff -Nur linux-mips-cvs/fs/jffs2/super.c linux-mips/fs/jffs2/super.c
---- linux-mips-cvs/fs/jffs2/super.c	2003-01-11 18:53:17.000000000 +0100
-+++ linux-mips/fs/jffs2/super.c	2005-02-07 05:08:35.000000000 +0100
+Index: linux-2.4.35.4/fs/jffs2/super.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/jffs2/super.c	2007-12-15 05:19:42.678853169 +0100
++++ linux-2.4.35.4/fs/jffs2/super.c	2007-12-15 05:19:49.323231810 +0100
 @@ -35,6 +35,7 @@
   *
   */
diff --git a/target/linux/generic-2.4/patches/004-exec_pagesize.patch b/target/linux/generic-2.4/patches/004-exec_pagesize.patch
index a7b1d04064..c48906dafd 100644
--- a/target/linux/generic-2.4/patches/004-exec_pagesize.patch
+++ b/target/linux/generic-2.4/patches/004-exec_pagesize.patch
@@ -1,5 +1,7 @@
---- linux.old/include/asm-mips/param.h	2005-01-19 15:10:12.000000000 +0100
-+++ linux.dev/include/asm-mips/param.h	2005-05-30 02:42:06.000000000 +0200
+Index: linux-2.4.35.4/include/asm-mips/param.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/param.h	2007-12-15 05:19:42.518844050 +0100
++++ linux-2.4.35.4/include/asm-mips/param.h	2007-12-15 05:19:49.823260305 +0100
 @@ -55,7 +55,7 @@
  #endif /* defined(__KERNEL__)  */
  #endif /* defined(HZ)  */
diff --git a/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch b/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch
index 9115b9f611..6e4b5c820f 100644
--- a/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch
+++ b/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch
@@ -1,6 +1,7 @@
-diff -Nur linux-2.4.30/drivers/mtd/chips/Config.in linux-2.4.30.openwrt/drivers/mtd/chips/Config.in
---- linux-2.4.30/drivers/mtd/chips/Config.in	2003-06-13 16:51:34.000000000 +0200
-+++ linux-2.4.30.openwrt/drivers/mtd/chips/Config.in	2005-06-28 11:26:26.000000000 +0200
+Index: linux-2.4.35.4/drivers/mtd/chips/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/chips/Config.in	2007-12-15 05:19:42.454840402 +0100
++++ linux-2.4.35.4/drivers/mtd/chips/Config.in	2007-12-15 05:19:50.035272385 +0100
 @@ -45,6 +45,7 @@
  dep_tristate '  Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE
  dep_tristate '  Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE
@@ -9,9 +10,10 @@ diff -Nur linux-2.4.30/drivers/mtd/chips/Config.in linux-2.4.30.openwrt/drivers/
  
  dep_tristate '  Support for RAM chips in bus mapping' CONFIG_MTD_RAM $CONFIG_MTD
  dep_tristate '  Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD
-diff -Nur linux-2.4.30/drivers/mtd/chips/Makefile linux-2.4.30.openwrt/drivers/mtd/chips/Makefile
---- linux-2.4.30/drivers/mtd/chips/Makefile	2003-06-13 16:51:34.000000000 +0200
-+++ linux-2.4.30.openwrt/drivers/mtd/chips/Makefile	2005-06-28 11:26:26.000000000 +0200
+Index: linux-2.4.35.4/drivers/mtd/chips/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/chips/Makefile	2007-12-15 05:19:42.462840857 +0100
++++ linux-2.4.35.4/drivers/mtd/chips/Makefile	2007-12-15 05:19:50.039272613 +0100
 @@ -18,6 +18,7 @@
  obj-$(CONFIG_MTD_AMDSTD)	+= amd_flash.o 
  obj-$(CONFIG_MTD_CFI)		+= cfi_probe.o
@@ -20,9 +22,10 @@ diff -Nur linux-2.4.30/drivers/mtd/chips/Makefile linux-2.4.30.openwrt/drivers/m
  obj-$(CONFIG_MTD_CFI_AMDSTD)	+= cfi_cmdset_0002.o
  obj-$(CONFIG_MTD_CFI_INTELEXT)	+= cfi_cmdset_0001.o
  obj-$(CONFIG_MTD_GEN_PROBE)	+= gen_probe.o
-diff -Nur linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0701.c linux-2.4.30.openwrt/drivers/mtd/chips/cfi_cmdset_0701.c
---- linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0701.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.30.openwrt/drivers/mtd/chips/cfi_cmdset_0701.c	2005-06-28 11:26:26.000000000 +0200
+Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c	2007-12-15 05:19:50.047273069 +0100
 @@ -0,0 +1,855 @@
 +/*
 + * Common Flash Interface support:
@@ -879,9 +882,10 @@ diff -Nur linux-2.4.30/drivers/mtd/chips/cfi_cmdset_0701.c linux-2.4.30.openwrt/
 +module_init(cfi_sststd_init);
 +module_exit(cfi_sststd_exit);
 +
-diff -Nur linux-2.4.30/drivers/mtd/chips/cfi_probe.c linux-2.4.30.openwrt/drivers/mtd/chips/cfi_probe.c
---- linux-2.4.30/drivers/mtd/chips/cfi_probe.c	2003-06-13 16:51:34.000000000 +0200
-+++ linux-2.4.30.openwrt/drivers/mtd/chips/cfi_probe.c	2005-06-28 11:26:26.000000000 +0200
+Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_probe.c	2007-12-15 05:19:42.474841541 +0100
++++ linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c	2007-12-15 05:19:50.051273298 +0100
 @@ -67,8 +67,15 @@
  	cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
  	cfi_send_gen_cmd(0x98, 0x55, base, map, cfi, cfi->device_type, NULL);
@@ -900,9 +904,10 @@ diff -Nur linux-2.4.30/drivers/mtd/chips/cfi_probe.c linux-2.4.30.openwrt/driver
  
  	if (!cfi->numchips) {
  		/* This is the first time we're called. Set up the CFI 
-diff -Nur linux-2.4.30/drivers/mtd/chips/gen_probe.c linux-2.4.30.openwrt/drivers/mtd/chips/gen_probe.c
---- linux-2.4.30/drivers/mtd/chips/gen_probe.c	2003-08-25 13:44:42.000000000 +0200
-+++ linux-2.4.30.openwrt/drivers/mtd/chips/gen_probe.c	2005-06-28 11:29:23.000000000 +0200
+Index: linux-2.4.35.4/drivers/mtd/chips/gen_probe.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/chips/gen_probe.c	2007-12-15 05:19:42.482841997 +0100
++++ linux-2.4.35.4/drivers/mtd/chips/gen_probe.c	2007-12-15 05:19:50.055273524 +0100
 @@ -328,13 +328,18 @@
  		return cfi_cmdset_0001(map, primary);
  #endif
diff --git a/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch b/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch
index b2397f6249..6663202a1f 100644
--- a/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch
+++ b/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch
@@ -1,6 +1,7 @@
-diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux.old/drivers/mtd/chips/cfi_cmdset_0001.c	2004-11-17 12:54:21.000000000 +0100
-+++ linux.dev/drivers/mtd/chips/cfi_cmdset_0001.c	2006-03-16 17:25:04.000000000 +0100
+Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c	2007-12-15 05:19:42.414838122 +0100
++++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c	2007-12-15 05:19:50.315288342 +0100
 @@ -28,10 +28,18 @@
  #include <linux/slab.h>
  #include <linux/delay.h>
@@ -38,7 +39,7 @@ diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/ch
  	return mtd;
  
   setup_err:
-@@ -1960,10 +1972,40 @@
+@@ -1961,10 +1973,40 @@
  	}
  }
  
@@ -79,9 +80,10 @@ diff -urN linux.old/drivers/mtd/chips/cfi_cmdset_0001.c linux.dev/drivers/mtd/ch
  	kfree(cfi->cmdset_priv);
  	kfree(cfi->cfiq);
  	kfree(cfi);
-diff -urN linux.old/include/linux/mtd/mtd.h linux.dev/include/linux/mtd/mtd.h
---- linux.old/include/linux/mtd/mtd.h	2003-08-25 13:44:44.000000000 +0200
-+++ linux.dev/include/linux/mtd/mtd.h	2006-03-16 17:00:10.000000000 +0100
+Index: linux-2.4.35.4/include/linux/mtd/mtd.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/mtd/mtd.h	2007-12-15 05:19:42.422838578 +0100
++++ linux-2.4.35.4/include/linux/mtd/mtd.h	2007-12-15 05:19:50.315288342 +0100
 @@ -10,6 +10,7 @@
  #include <linux/version.h>
  #include <linux/types.h>
diff --git a/target/linux/generic-2.4/patches/009-mtd_uaccess.patch b/target/linux/generic-2.4/patches/009-mtd_uaccess.patch
index 2ddfca9bd2..0d02d8557c 100644
--- a/target/linux/generic-2.4/patches/009-mtd_uaccess.patch
+++ b/target/linux/generic-2.4/patches/009-mtd_uaccess.patch
@@ -1,6 +1,15 @@
---- linux.old/drivers/mtd/mtdchar.c	2006-11-23 18:48:56.000000000 +0100
-+++ linux.dev/drivers/mtd/mtdchar.c	2006-11-23 18:49:11.000000000 +0100
-@@ -564,7 +564,7 @@
+Index: linux-2.4.35.4/drivers/mtd/mtdchar.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/mtdchar.c	2007-12-15 05:19:42.370835614 +0100
++++ linux-2.4.35.4/drivers/mtd/mtdchar.c	2007-12-15 05:19:50.539301109 +0100
+@@ -558,13 +558,13 @@
+ 	sprintf(name, "%d", mtd->index);
+ 	devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name,
+ 			DEVFS_FL_DEFAULT, MTD_CHAR_MAJOR, mtd->index*2,
+-			S_IFCHR | S_IRUGO | S_IWUGO,
++			S_IFCHR | S_IRUSR | S_IWUSR,
+ 			&mtd_fops, NULL);
+ 
  	sprintf(name, "%dro", mtd->index);
  	devfs_ro_handle[mtd->index] = devfs_register(devfs_dir_handle, name,
  			DEVFS_FL_DEFAULT, MTD_CHAR_MAJOR, mtd->index*2+1,
@@ -9,8 +18,10 @@
  			&mtd_fops, NULL);
  }
  
---- linux-2.4.30/drivers/mtd/mtdblock.c.orig	2006-03-26 06:38:36 -05:00
-+++ linux-2.4.30/drivers/mtd/mtdblock.c	2006-03-26 06:38:54 -05:00
+Index: linux-2.4.35.4/drivers/mtd/mtdblock.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/mtd/mtdblock.c	2007-12-15 05:19:42.378836072 +0100
++++ linux-2.4.35.4/drivers/mtd/mtdblock.c	2007-12-15 05:19:50.539301109 +0100
 @@ -601,7 +601,7 @@
          sprintf(name, "%d", mtd->index);
          devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name,
@@ -20,14 +31,3 @@
                          &mtd_fops, NULL);
  }
  
---- linux-2.4.30/drivers/mtd/mtdchar.c.orig	2006-03-26 06:42:23 -05:00
-+++ linux-2.4.30/drivers/mtd/mtdchar.c	2006-03-26 06:42:41 -05:00
-@@ -558,7 +558,7 @@
- 	sprintf(name, "%d", mtd->index);
- 	devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name,
- 			DEVFS_FL_DEFAULT, MTD_CHAR_MAJOR, mtd->index*2,
--			S_IFCHR | S_IRUGO | S_IWUGO,
-+			S_IFCHR | S_IRUSR | S_IWUSR,
- 			&mtd_fops, NULL);
- 
- 	sprintf(name, "%dro", mtd->index);
diff --git a/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch
index 8647652018..5998e89a55 100644
--- a/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch
+++ b/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch
@@ -1,6 +1,7 @@
-diff -Nur linux-2.4.32/fs/squashfs/Makefile linux-2.4.32-owrt/fs/squashfs/Makefile
---- linux-2.4.32/fs/squashfs/Makefile	2006-03-21 13:47:50.000000000 +0100
-+++ linux-2.4.32-owrt/fs/squashfs/Makefile	2006-03-21 13:48:49.000000000 +0100
+Index: linux-2.4.35.4/fs/squashfs/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/fs/squashfs/Makefile	2007-12-15 05:19:49.031215169 +0100
++++ linux-2.4.35.4/fs/squashfs/Makefile	2007-12-15 05:19:50.759313646 +0100
 @@ -4,7 +4,7 @@
  
  O_TARGET := squashfs.o
@@ -10,9 +11,10 @@ diff -Nur linux-2.4.32/fs/squashfs/Makefile linux-2.4.32-owrt/fs/squashfs/Makefi
  
  obj-m := $(O_TARGET)
  
-diff -Nur linux-2.4.32/fs/squashfs/squashfs.h linux-2.4.32-owrt/fs/squashfs/squashfs.h
---- linux-2.4.32/fs/squashfs/squashfs.h	2006-03-21 13:06:10.000000000 +0100
-+++ linux-2.4.32-owrt/fs/squashfs/squashfs.h	2006-03-21 13:48:36.000000000 +0100
+Index: linux-2.4.35.4/fs/squashfs/squashfs.h
+===================================================================
+--- linux-2.4.35.4.orig/fs/squashfs/squashfs.h	2007-12-15 05:19:48.659193968 +0100
++++ linux-2.4.35.4/fs/squashfs/squashfs.h	2007-12-15 05:19:50.767314102 +0100
 @@ -24,6 +24,9 @@
  #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
  #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
diff --git a/target/linux/generic-2.4/patches/050-build_flags.patch b/target/linux/generic-2.4/patches/050-build_flags.patch
index 14a207df23..5eab6334e0 100644
--- a/target/linux/generic-2.4/patches/050-build_flags.patch
+++ b/target/linux/generic-2.4/patches/050-build_flags.patch
@@ -1,6 +1,7 @@
-diff -ur linux-2.4.32/arch/mips/Makefile linux-2.4.32-openwrt/arch/mips/Makefile
---- linux-2.4.32/arch/mips/Makefile	2005-12-15 13:53:59.000000000 +0100
-+++ linux-2.4.32-openwrt/arch/mips/Makefile	2005-12-15 14:02:33.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/Makefile	2007-12-15 05:19:44.870978088 +0100
++++ linux-2.4.35.4/arch/mips/Makefile	2007-12-15 05:19:50.987326639 +0100
 @@ -44,10 +44,10 @@
  GCCFLAGS	:= -I $(TOPDIR)/include/asm/gcc
  GCCFLAGS	+= -G 0 -mno-abicalls -fno-pic -pipe
@@ -48,9 +49,10 @@ diff -ur linux-2.4.32/arch/mips/Makefile linux-2.4.32-openwrt/arch/mips/Makefile
  CFLAGS		+= $(GCCFLAGS)
  
  LD		+= -m $(ld-emul)
-diff -ur linux-2.4.32/Makefile linux-2.4.32-openwrt/Makefile
---- linux-2.4.32/Makefile	2005-12-15 13:53:59.000000000 +0100
-+++ linux-2.4.32-openwrt/Makefile	2005-12-15 13:59:30.000000000 +0100
+Index: linux-2.4.35.4/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/Makefile	2007-12-15 05:19:45.074989715 +0100
++++ linux-2.4.35.4/Makefile	2007-12-15 05:19:50.995327098 +0100
 @@ -17,7 +17,7 @@
  FINDHPATH	= $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
  
@@ -70,9 +72,9 @@ diff -ur linux-2.4.32/Makefile linux-2.4.32-openwrt/Makefile
 -CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
 +CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
  	  -fno-strict-aliasing -fno-common
- CFLAGS += -fno-builtin-sprintf
+ CFLAGS += -fno-builtin-strpbrk -fno-builtin-sprintf
  ifndef CONFIG_FRAME_POINTER
-@@ -104,6 +103,8 @@
+@@ -105,6 +104,8 @@
  # disable pointer signedness warnings in gcc 4.0
  CFLAGS += $(call check_gcc,-Wno-pointer-sign,)
  
diff --git a/target/linux/generic-2.4/patches/051-parallel_build.patch b/target/linux/generic-2.4/patches/051-parallel_build.patch
index 2ea70df7db..ff9d88bcf5 100644
--- a/target/linux/generic-2.4/patches/051-parallel_build.patch
+++ b/target/linux/generic-2.4/patches/051-parallel_build.patch
@@ -1,6 +1,8 @@
---- linux-2.4.32/arch/mips/Makefile.old	2006-10-18 21:11:18.110720000 +0200
-+++ linux-2.4.32/arch/mips/Makefile	2006-10-18 21:12:32.570720000 +0200
-@@ -752,6 +752,7 @@
+Index: linux-2.4.35.4/arch/mips/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/Makefile	2007-12-15 05:19:50.987326639 +0100
++++ linux-2.4.35.4/arch/mips/Makefile	2007-12-15 05:19:51.215339635 +0100
+@@ -739,6 +739,7 @@
  HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
  
  SUBDIRS := $(addprefix arch/mips/, tools) $(SUBDIRS) $(addprefix arch/mips/, kernel mm lib)
@@ -8,7 +10,7 @@
  CORE_FILES := arch/mips/kernel/kernel.o arch/mips/mm/mm.o $(CORE_FILES)
  LIBS := arch/mips/lib/lib.a $(LIBS)
  
-@@ -799,7 +800,7 @@
+@@ -785,7 +786,7 @@
  	$(MAKE) -C arch/$(ARCH)/tools mrproper
  
  archdep:
diff --git a/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch b/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch
index 091e4ba7a4..5e1b6b7eff 100644
--- a/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch
+++ b/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch
@@ -1,13 +1,15 @@
---- linux.old/Makefile	Tue Oct 10 22:24:41 2006
-+++ linux.dev/Makefile	Tue Oct 10 22:26:19 2006
-@@ -427,17 +427,8 @@
+Index: linux-2.4.35.4/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/Makefile	2007-12-15 05:19:50.995327098 +0100
++++ linux-2.4.35.4/Makefile	2007-12-15 05:19:51.427351715 +0100
+@@ -428,18 +428,9 @@
  depmod_opts	:= -b $(INSTALL_MOD_PATH) -r
  endif
  .PHONY: _modinst_post
 -_modinst_post: _modinst_post_pcmcia
 +_modinst_post:
  	if [ -r System.map ]; then $(DEPMOD) -ae -F System.map $(depmod_opts) $(KERNELRELEASE); fi
--
+ 
 -# Backwards compatibilty symlinks for people still using old versions
 -# of pcmcia-cs with hard coded pathnames on insmod.  Remove
 -# _modinst_post_pcmcia for kernel 2.4.1.
@@ -16,6 +18,7 @@
 -	cd $(MODLIB); \
 -	mkdir -p pcmcia; \
 -	find kernel -path '*/pcmcia/*' -name '*.o' | xargs -i -r ln -sf ../{} pcmcia
- 
+-
  .PHONY: $(patsubst %, _modinst_%, $(SUBDIRS))
  $(patsubst %, _modinst_%, $(SUBDIRS)) :
+ 	$(MAKE) -C $(patsubst _modinst_%, %, $@) modules_install
diff --git a/target/linux/generic-2.4/patches/100-wireless-extension.patch b/target/linux/generic-2.4/patches/100-wireless-extension.patch
index 88e91831ff..fe10d501f5 100644
--- a/target/linux/generic-2.4/patches/100-wireless-extension.patch
+++ b/target/linux/generic-2.4/patches/100-wireless-extension.patch
@@ -1,6 +1,7 @@
-diff -Nur linux-2.4.32/include/linux/netdevice.h linux-2.4.32-we/include/linux/netdevice.h
---- linux-2.4.32/include/linux/netdevice.h	2004-11-17 12:54:22.000000000 +0100
-+++ linux-2.4.32-we/include/linux/netdevice.h	2006-03-13 12:10:57.000000000 +0100
+Index: linux-2.4.35.4/include/linux/netdevice.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netdevice.h	2007-12-15 05:19:42.162823760 +0100
++++ linux-2.4.35.4/include/linux/netdevice.h	2007-12-15 05:19:51.635363571 +0100
 @@ -295,7 +295,9 @@
  
  	/* List of functions to handle Wireless Extensions (instead of ioctl).
@@ -12,9 +13,10 @@ diff -Nur linux-2.4.32/include/linux/netdevice.h linux-2.4.32-we/include/linux/n
  
  	struct ethtool_ops *ethtool_ops;
  
-diff -Nur linux-2.4.32/include/linux/wireless.h linux-2.4.32-we/include/linux/wireless.h
---- linux-2.4.32/include/linux/wireless.h	2003-11-28 19:26:21.000000000 +0100
-+++ linux-2.4.32-we/include/linux/wireless.h	2006-03-13 12:11:02.000000000 +0100
+Index: linux-2.4.35.4/include/linux/wireless.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/wireless.h	2007-12-15 05:19:42.170824216 +0100
++++ linux-2.4.35.4/include/linux/wireless.h	2007-12-15 05:19:51.643364027 +0100
 @@ -1,10 +1,10 @@
  /*
   * This file define a set of standard wireless extensions
@@ -470,9 +472,10 @@ diff -Nur linux-2.4.32/include/linux/wireless.h linux-2.4.32-we/include/linux/wi
  };
  
  /*
-diff -Nur linux-2.4.32/include/net/iw_handler.h linux-2.4.32-we/include/net/iw_handler.h
---- linux-2.4.32/include/net/iw_handler.h	2003-11-28 19:26:21.000000000 +0100
-+++ linux-2.4.32-we/include/net/iw_handler.h	2006-03-13 12:10:57.000000000 +0100
+Index: linux-2.4.35.4/include/net/iw_handler.h
+===================================================================
+--- linux-2.4.35.4.orig/include/net/iw_handler.h	2007-12-15 05:19:42.178824671 +0100
++++ linux-2.4.35.4/include/net/iw_handler.h	2007-12-15 05:19:51.647364253 +0100
 @@ -1,10 +1,10 @@
  /*
   * This file define the new driver API for Wireless Extensions
@@ -590,9 +593,10 @@ diff -Nur linux-2.4.32/include/net/iw_handler.h linux-2.4.32-we/include/net/iw_h
  };
  
  /**************************** PROTOTYPES ****************************/
-diff -Nur linux-2.4.32/net/core/dev.c linux-2.4.32-we/net/core/dev.c
---- linux-2.4.32/net/core/dev.c	2005-04-04 03:42:20.000000000 +0200
-+++ linux-2.4.32-we/net/core/dev.c	2006-03-13 12:10:57.000000000 +0100
+Index: linux-2.4.35.4/net/core/dev.c
+===================================================================
+--- linux-2.4.35.4.orig/net/core/dev.c	2007-12-15 05:19:42.186825129 +0100
++++ linux-2.4.35.4/net/core/dev.c	2007-12-15 05:19:51.651364482 +0100
 @@ -2426,7 +2426,7 @@
  				/* Follow me in net/core/wireless.c */
  				ret = wireless_process_ioctl(&ifr, cmd);
@@ -602,9 +606,10 @@ diff -Nur linux-2.4.32/net/core/dev.c linux-2.4.32-we/net/core/dev.c
  				    copy_to_user(arg, &ifr, sizeof(struct ifreq)))
  					return -EFAULT;
  				return ret;
-diff -Nur linux-2.4.32/net/core/wireless.c linux-2.4.32-we/net/core/wireless.c
---- linux-2.4.32/net/core/wireless.c	2003-11-28 19:26:21.000000000 +0100
-+++ linux-2.4.32-we/net/core/wireless.c	2006-03-13 12:11:02.000000000 +0100
+Index: linux-2.4.35.4/net/core/wireless.c
+===================================================================
+--- linux-2.4.35.4.orig/net/core/wireless.c	2007-12-15 05:19:42.194825585 +0100
++++ linux-2.4.35.4/net/core/wireless.c	2007-12-15 05:19:51.655364711 +0100
 @@ -2,7 +2,7 @@
   * This file implement the Wireless Extensions APIs.
   *
diff --git a/target/linux/generic-2.4/patches/106-mppe_mppc.patch b/target/linux/generic-2.4/patches/106-mppe_mppc.patch
index 382b4623f2..7cc5dc9867 100644
--- a/target/linux/generic-2.4/patches/106-mppe_mppc.patch
+++ b/target/linux/generic-2.4/patches/106-mppe_mppc.patch
@@ -4,10 +4,11 @@ Microsoft Point-to-Point Encryption / Compression support
 
   http://www.polbox.com/h/hs001/linux-2.4.29-mppe-mppc-1.3.patch.gz
 
-diff -ruN linux-2.4.29.orig/Documentation/Configure.help linux-2.4.29/Documentation/Configure.help
---- linux-2.4.29.orig/Documentation/Configure.help	2005-02-02 22:18:18.000000000 +0100
-+++ linux-2.4.29/Documentation/Configure.help	2005-02-02 22:26:37.000000000 +0100
-@@ -9969,6 +9969,28 @@
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:19:49.287229757 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:19:51.927380210 +0100
+@@ -9974,6 +9974,28 @@
    module; it is called bsd_comp.o and will show up in the directory
    modules once you have said "make modules". If unsure, say N.
  
@@ -36,9 +37,10 @@ diff -ruN linux-2.4.29.orig/Documentation/Configure.help linux-2.4.29/Documentat
  PPP over Ethernet
  CONFIG_PPPOE
    Support for PPP over Ethernet.
-diff -ruN linux-2.4.29.orig/crypto/Config.in linux-2.4.29/crypto/Config.in
---- linux-2.4.29.orig/crypto/Config.in	2005-02-02 22:18:14.000000000 +0100
-+++ linux-2.4.29/crypto/Config.in	2005-02-02 22:26:37.000000000 +0100
+Index: linux-2.4.35.4/crypto/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/crypto/Config.in	2007-12-15 05:19:42.094819886 +0100
++++ linux-2.4.35.4/crypto/Config.in	2007-12-15 05:19:51.927380210 +0100
 @@ -11,7 +11,9 @@
       "$CONFIG_INET6_AH" = "y" -o \
       "$CONFIG_INET6_AH" = "m" -o \
@@ -100,10 +102,11 @@ diff -ruN linux-2.4.29.orig/crypto/Config.in linux-2.4.29/crypto/Config.in
    if [ "$CONFIG_INET_IPCOMP" = "y" -o \
         "$CONFIG_INET_IPCOMP" = "m" -o \
         "$CONFIG_INET6_IPCOMP" = "y" -o \
-diff -ruN linux-2.4.29.orig/drivers/net/Config.in linux-2.4.29/drivers/net/Config.in
---- linux-2.4.29.orig/drivers/net/Config.in	2005-02-02 22:17:31.000000000 +0100
-+++ linux-2.4.29/drivers/net/Config.in	2005-02-02 22:26:37.000000000 +0100
-@@ -332,6 +332,7 @@
+Index: linux-2.4.35.4/drivers/net/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/Config.in	2007-12-15 05:19:42.102820341 +0100
++++ linux-2.4.35.4/drivers/net/Config.in	2007-12-15 05:19:51.931380439 +0100
+@@ -336,6 +336,7 @@
     dep_tristate '  PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP
     dep_tristate '  PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
     dep_tristate '  PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP $CONFIG_PPP
@@ -111,10 +114,11 @@ diff -ruN linux-2.4.29.orig/drivers/net/Config.in linux-2.4.29/drivers/net/Confi
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
        dep_tristate '  PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP
     fi
-diff -ruN linux-2.4.29.orig/drivers/net/Makefile linux-2.4.29/drivers/net/Makefile
---- linux-2.4.29.orig/drivers/net/Makefile	2005-02-02 22:17:23.000000000 +0100
-+++ linux-2.4.29/drivers/net/Makefile	2005-02-02 22:26:37.000000000 +0100
-@@ -163,6 +163,7 @@
+Index: linux-2.4.35.4/drivers/net/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/Makefile	2007-12-15 05:19:42.110820796 +0100
++++ linux-2.4.35.4/drivers/net/Makefile	2007-12-15 05:19:51.931380439 +0100
+@@ -166,6 +166,7 @@
  obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
  obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
  obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
@@ -122,9 +126,10 @@ diff -ruN linux-2.4.29.orig/drivers/net/Makefile linux-2.4.29/drivers/net/Makefi
  obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
  
  obj-$(CONFIG_SLIP) += slip.o
-diff -ruN linux-2.4.29.orig/drivers/net/ppp_generic.c linux-2.4.29/drivers/net/ppp_generic.c
---- linux-2.4.29.orig/drivers/net/ppp_generic.c	2005-02-02 22:17:24.000000000 +0100
-+++ linux-2.4.29/drivers/net/ppp_generic.c	2005-02-02 22:26:37.000000000 +0100
+Index: linux-2.4.35.4/drivers/net/ppp_generic.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/ppp_generic.c	2007-12-15 05:19:42.114821025 +0100
++++ linux-2.4.35.4/drivers/net/ppp_generic.c	2007-12-15 05:19:51.931380439 +0100
 @@ -19,7 +19,7 @@
   * PPP driver, written by Michael Callahan and Al Longyear, and
   * subsequently hacked by Paul Mackerras.
@@ -258,9 +263,10 @@ diff -ruN linux-2.4.29.orig/drivers/net/ppp_generic.c linux-2.4.29/drivers/net/p
  	init_ppp_file(&ppp->file, INTERFACE);
  	ppp->file.hdrlen = PPP_HDRLEN - 2;	/* don't count proto bytes */
  	for (i = 0; i < NUM_NP; ++i)
-diff -ruN linux-2.4.29.orig/drivers/net/ppp_mppe_mppc.c linux-2.4.29/drivers/net/ppp_mppe_mppc.c
---- linux-2.4.29.orig/drivers/net/ppp_mppe_mppc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/net/ppp_mppe_mppc.c	2005-02-02 23:07:40.000000000 +0100
+Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c	2007-12-15 05:19:51.935380668 +0100
 @@ -0,0 +1,1312 @@
 +/*
 + * ppp_mppe_mppc.c - MPPC/MPPE "compressor/decompressor" module.
@@ -1574,9 +1580,10 @@ diff -ruN linux-2.4.29.orig/drivers/net/ppp_mppe_mppc.c linux-2.4.29/drivers/net
 +MODULE_AUTHOR("Jan Dubiec <jdx@slackware.pl>");
 +MODULE_DESCRIPTION("MPPE/MPPC encryption/compression module for Linux");
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -ruN linux-2.4.29.orig/include/linux/ppp-comp.h linux-2.4.29/include/linux/ppp-comp.h
---- linux-2.4.29.orig/include/linux/ppp-comp.h	2005-02-02 22:18:25.000000000 +0100
-+++ linux-2.4.29/include/linux/ppp-comp.h	2005-02-02 22:41:01.000000000 +0100
+Index: linux-2.4.35.4/include/linux/ppp-comp.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/ppp-comp.h	2007-12-15 05:19:42.134822165 +0100
++++ linux-2.4.35.4/include/linux/ppp-comp.h	2007-12-15 05:19:51.935380668 +0100
 @@ -28,7 +28,7 @@
   */
  
diff --git a/target/linux/generic-2.4/patches/107-cifs.patch b/target/linux/generic-2.4/patches/107-cifs.patch
index bdccf4de9f..3413e00210 100644
--- a/target/linux/generic-2.4/patches/107-cifs.patch
+++ b/target/linux/generic-2.4/patches/107-cifs.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.4.29.old/Documentation/Configure.help linux-2.4.29/Documentation/Configure.help
---- linux-2.4.29.old/Documentation/Configure.help	2005-03-21 19:30:22.000000000 +0100
-+++ linux-2.4.29/Documentation/Configure.help	2005-03-21 19:36:51.000000000 +0100
-@@ -17943,6 +17943,34 @@
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:19:51.927380210 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:19:52.251398675 +0100
+@@ -17995,6 +17995,34 @@
  
    If you don't know what all this is about, say N.
  
@@ -36,9 +37,10 @@ diff -urN linux-2.4.29.old/Documentation/Configure.help linux-2.4.29/Documentati
  SMB file system support (to mount Windows shares etc.)
  CONFIG_SMB_FS
    SMB (Server Message Block) is the protocol Windows for Workgroups
-diff -urN linux-2.4.29.old/Documentation/filesystems/00-INDEX linux-2.4.29/Documentation/filesystems/00-INDEX
---- linux-2.4.29.old/Documentation/filesystems/00-INDEX	2004-02-18 14:36:30.000000000 +0100
-+++ linux-2.4.29/Documentation/filesystems/00-INDEX	2005-03-21 19:36:51.000000000 +0100
+Index: linux-2.4.35.4/Documentation/filesystems/00-INDEX
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/filesystems/00-INDEX	2007-12-15 05:19:41.822804384 +0100
++++ linux-2.4.35.4/Documentation/filesystems/00-INDEX	2007-12-15 05:19:52.255398905 +0100
 @@ -10,6 +10,8 @@
  	- info for the BeOS file system (BFS)
  bfs.txt
@@ -48,9 +50,10 @@ diff -urN linux-2.4.29.old/Documentation/filesystems/00-INDEX linux-2.4.29/Docum
  coda.txt
  	- description of the CODA filesystem.
  cramfs.txt
-diff -urN linux-2.4.29.old/Documentation/filesystems/cifs.txt linux-2.4.29/Documentation/filesystems/cifs.txt
---- linux-2.4.29.old/Documentation/filesystems/cifs.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/Documentation/filesystems/cifs.txt	2005-03-21 19:36:51.000000000 +0100
+Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/Documentation/filesystems/cifs.txt	2007-12-15 05:19:52.259399131 +0100
 @@ -0,0 +1,51 @@
 +  This is the client VFS module for the Common Internet File System
 +  (CIFS) protocol which is the successor to the Server Message Block 
@@ -103,9 +106,10 @@ diff -urN linux-2.4.29.old/Documentation/filesystems/cifs.txt linux-2.4.29/Docum
 +  or the Samba site:
 +     
 +      http://www.samba.org
-diff -urN linux-2.4.29.old/fs/cifs/asn1.c linux-2.4.29/fs/cifs/asn1.c
---- linux-2.4.29.old/fs/cifs/asn1.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/asn1.c	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/asn1.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/asn1.c	2007-12-15 05:19:52.263399360 +0100
 @@ -0,0 +1,614 @@
 +/* 
 + * The ASB.1/BER parsing code is derived from ip_nat_snmp_basic.c which was in
@@ -721,9 +725,10 @@ diff -urN linux-2.4.29.old/fs/cifs/asn1.c linux-2.4.29/fs/cifs/asn1.c
 +
 +	return 1;
 +}
-diff -urN linux-2.4.29.old/fs/cifs/AUTHORS linux-2.4.29/fs/cifs/AUTHORS
---- linux-2.4.29.old/fs/cifs/AUTHORS	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/AUTHORS	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/AUTHORS
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/AUTHORS	2007-12-15 05:19:52.267399586 +0100
 @@ -0,0 +1,37 @@
 +Original Author
 +===============
@@ -762,9 +767,10 @@ diff -urN linux-2.4.29.old/fs/cifs/AUTHORS linux-2.4.29/fs/cifs/AUTHORS
 +
 +And thanks to the IBM LTC and Power test teams and SuSE testers for
 +finding multiple bugs during excellent stress test runs.
-diff -urN linux-2.4.29.old/fs/cifs/CHANGES linux-2.4.29/fs/cifs/CHANGES
---- linux-2.4.29.old/fs/cifs/CHANGES	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/CHANGES	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/CHANGES
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/CHANGES	2007-12-15 05:19:52.271399815 +0100
 @@ -0,0 +1,572 @@
 +Version 1.20
 +------------
@@ -1338,9 +1344,10 @@ diff -urN linux-2.4.29.old/fs/cifs/CHANGES linux-2.4.29/fs/cifs/CHANGES
 +-----------
 +Initial drop
 +
-diff -urN linux-2.4.29.old/fs/cifs/cifs_debug.c linux-2.4.29/fs/cifs/cifs_debug.c
---- linux-2.4.29.old/fs/cifs/cifs_debug.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_debug.c	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifs_debug.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifs_debug.c	2007-12-15 05:19:52.275400045 +0100
 @@ -0,0 +1,797 @@
 +/*
 + *   fs/cifs_debug.c
@@ -2139,9 +2146,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_debug.c linux-2.4.29/fs/cifs/cifs_debug.
 +
 +
 +#endif
-diff -urN linux-2.4.29.old/fs/cifs/cifs_debug.h linux-2.4.29/fs/cifs/cifs_debug.h
---- linux-2.4.29.old/fs/cifs/cifs_debug.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_debug.h	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifs_debug.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifs_debug.h	2007-12-15 05:19:52.279400271 +0100
 @@ -0,0 +1,66 @@
 +/*
 + *
@@ -2209,9 +2217,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_debug.h linux-2.4.29/fs/cifs/cifs_debug.
 +#endif		/* _CIFS_DEBUG */
 +
 +#endif				/* _H_CIFS_DEBUG */
-diff -urN linux-2.4.29.old/fs/cifs/cifsencrypt.c linux-2.4.29/fs/cifs/cifsencrypt.c
---- linux-2.4.29.old/fs/cifs/cifsencrypt.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifsencrypt.c	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifsencrypt.c	2007-12-15 05:19:52.279400271 +0100
 @@ -0,0 +1,204 @@
 +/*
 + *   fs/cifs/cifsencrypt.c
@@ -2417,9 +2426,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifsencrypt.c linux-2.4.29/fs/cifs/cifsencryp
 +
 +	hmac_md5_final(v2_session_response,&context);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/cifserr.c linux-2.4.29/fs/cifs/cifserr.c
---- linux-2.4.29.old/fs/cifs/cifserr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifserr.c	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifserr.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifserr.c	2007-12-15 05:19:52.279400271 +0100
 @@ -0,0 +1,70 @@
 +/*
 + *   fs/cifserr.c
@@ -2491,9 +2501,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifserr.c linux-2.4.29/fs/cifs/cifserr.c
 +{
 +	return map_cifs_error(error_class, error_code, FALSE);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/cifsfs.c linux-2.4.29/fs/cifs/cifsfs.c
---- linux-2.4.29.old/fs/cifs/cifsfs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifsfs.c	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifsfs.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifsfs.c	2007-12-15 05:19:52.279400271 +0100
 @@ -0,0 +1,769 @@
 +/*
 + *   fs/cifs/cifsfs.c
@@ -3264,9 +3275,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifsfs.c linux-2.4.29/fs/cifs/cifsfs.c
 +    ("VFS to access servers complying with the SNIA CIFS Specification e.g. Samba and Windows");
 +module_init(init_cifs)
 +module_exit(exit_cifs)
-diff -urN linux-2.4.29.old/fs/cifs/cifsfs.h linux-2.4.29/fs/cifs/cifsfs.h
---- linux-2.4.29.old/fs/cifs/cifsfs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifsfs.h	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifsfs.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifsfs.h	2007-12-15 05:19:52.279400271 +0100
 @@ -0,0 +1,97 @@
 +/*
 + *   fs/cifs/cifsfs.h
@@ -3365,9 +3377,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifsfs.h linux-2.4.29/fs/cifs/cifsfs.h
 +extern ssize_t	cifs_listxattr(struct dentry *, char *, size_t);
 +#define CIFS_VERSION   "1.20"
 +#endif				/* _CIFSFS_H */
-diff -urN linux-2.4.29.old/fs/cifs/cifs_fs_sb.h linux-2.4.29/fs/cifs/cifs_fs_sb.h
---- linux-2.4.29.old/fs/cifs/cifs_fs_sb.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_fs_sb.h	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifs_fs_sb.h	2007-12-15 05:19:52.283400500 +0100
 @@ -0,0 +1,32 @@
 +/*
 + *   fs/cifs/cifs_fs_sb.h
@@ -3401,9 +3414,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_fs_sb.h linux-2.4.29/fs/cifs/cifs_fs_sb.
 +	mode_t	mnt_dir_mode;
 +};
 +#endif				/* _CIFS_FS_SB_H */
-diff -urN linux-2.4.29.old/fs/cifs/cifsglob.h linux-2.4.29/fs/cifs/cifsglob.h
---- linux-2.4.29.old/fs/cifs/cifsglob.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifsglob.h	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifsglob.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifsglob.h	2007-12-15 05:19:52.283400500 +0100
 @@ -0,0 +1,413 @@
 +/*
 + *   fs/cifs/cifsglob.h
@@ -3818,9 +3832,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifsglob.h linux-2.4.29/fs/cifs/cifsglob.h
 +GLOBAL_EXTERN unsigned int sign_CIFS_PDUs;  /* enable smb packet signing */
 +GLOBAL_EXTERN unsigned int linuxExtEnabled;  /* enable Linux/Unix CIFS extensions */
 +
-diff -urN linux-2.4.29.old/fs/cifs/cifspdu.h linux-2.4.29/fs/cifs/cifspdu.h
---- linux-2.4.29.old/fs/cifs/cifspdu.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifspdu.h	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifspdu.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifspdu.h	2007-12-15 05:19:52.283400500 +0100
 @@ -0,0 +1,1793 @@
 +/*
 + *   fs/cifs/cifspdu.h
@@ -5615,9 +5630,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifspdu.h linux-2.4.29/fs/cifs/cifspdu.h
 +#pragma pack()			/* resume default structure packing */
 +
 +#endif				/* _CIFSPDU_H */
-diff -urN linux-2.4.29.old/fs/cifs/cifsproto.h linux-2.4.29/fs/cifs/cifsproto.h
---- linux-2.4.29.old/fs/cifs/cifsproto.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifsproto.h	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifsproto.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifsproto.h	2007-12-15 05:19:52.287400726 +0100
 @@ -0,0 +1,254 @@
 +/*
 + *   fs/cifs/cifsproto.h
@@ -5873,9 +5889,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifsproto.h linux-2.4.29/fs/cifs/cifsproto.h
 +		 char * EAData, size_t size,
 +		 const struct nls_table *nls_codepage);
 +#endif			/* _CIFSPROTO_H */
-diff -urN linux-2.4.29.old/fs/cifs/cifssmb.c linux-2.4.29/fs/cifs/cifssmb.c
---- linux-2.4.29.old/fs/cifs/cifssmb.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifssmb.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifssmb.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifssmb.c	2007-12-15 05:19:52.287400726 +0100
 @@ -0,0 +1,3016 @@
 +/*
 + *   fs/cifs/cifssmb.c
@@ -8893,9 +8910,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifssmb.c linux-2.4.29/fs/cifs/cifssmb.c
 +	return rc;
 +}
 +#endif
-diff -urN linux-2.4.29.old/fs/cifs/cifs_unicode.c linux-2.4.29/fs/cifs/cifs_unicode.c
---- linux-2.4.29.old/fs/cifs/cifs_unicode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_unicode.c	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifs_unicode.c	2007-12-15 05:19:52.291400955 +0100
 @@ -0,0 +1,87 @@
 +/*
 + *   fs/cifs/cifs_unicode.c
@@ -8984,9 +9002,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_unicode.c linux-2.4.29/fs/cifs/cifs_unic
 +	return i;
 +}
 +
-diff -urN linux-2.4.29.old/fs/cifs/cifs_unicode.h linux-2.4.29/fs/cifs/cifs_unicode.h
---- linux-2.4.29.old/fs/cifs/cifs_unicode.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_unicode.h	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifs_unicode.h	2007-12-15 05:19:52.291400955 +0100
 @@ -0,0 +1,353 @@
 +/*
 + * cifs_unicode:  Unicode kernel case support
@@ -9341,9 +9360,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_unicode.h linux-2.4.29/fs/cifs/cifs_unic
 +}
 +
 +#endif
-diff -urN linux-2.4.29.old/fs/cifs/cifs_uniupr.h linux-2.4.29/fs/cifs/cifs_uniupr.h
---- linux-2.4.29.old/fs/cifs/cifs_uniupr.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/cifs_uniupr.h	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/cifs_uniupr.h	2007-12-15 05:19:52.291400955 +0100
 @@ -0,0 +1,253 @@
 +/*
 + *   Copyright (c) International Business Machines  Corp., 2000,2002
@@ -9598,9 +9618,10 @@ diff -urN linux-2.4.29.old/fs/cifs/cifs_uniupr.h linux-2.4.29/fs/cifs/cifs_uniup
 +	0, 0, 0
 +};
 +#endif
-diff -urN linux-2.4.29.old/fs/cifs/connect.c linux-2.4.29/fs/cifs/connect.c
---- linux-2.4.29.old/fs/cifs/connect.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/connect.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/connect.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/connect.c	2007-12-15 05:19:52.295401184 +0100
 @@ -0,0 +1,2924 @@
 +/*
 + *   fs/cifs/connect.c
@@ -12526,9 +12547,10 @@ diff -urN linux-2.4.29.old/fs/cifs/connect.c linux-2.4.29/fs/cifs/connect.c
 +	return rc;
 +}
 +
-diff -urN linux-2.4.29.old/fs/cifs/dir.c linux-2.4.29/fs/cifs/dir.c
---- linux-2.4.29.old/fs/cifs/dir.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/dir.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/dir.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/dir.c	2007-12-15 05:19:52.295401184 +0100
 @@ -0,0 +1,425 @@
 +/*
 + *   fs/cifs/dir.c
@@ -12955,9 +12977,10 @@ diff -urN linux-2.4.29.old/fs/cifs/dir.c linux-2.4.29/fs/cifs/dir.c
 +/* d_delete:       cifs_d_delete,       *//* not needed except for debugging */
 +	/* no need for d_hash, d_compare, d_release, d_iput ... yet. BB confirm this BB */
 +};
-diff -urN linux-2.4.29.old/fs/cifs/file.c linux-2.4.29/fs/cifs/file.c
---- linux-2.4.29.old/fs/cifs/file.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/file.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/file.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/file.c	2007-12-15 05:19:52.299401411 +0100
 @@ -0,0 +1,2185 @@
 +/*
 + *   fs/cifs/file.c
@@ -15144,9 +15167,10 @@ diff -urN linux-2.4.29.old/fs/cifs/file.c linux-2.4.29/fs/cifs/file.c
 +	.sync_page = cifs_sync_page,
 +	/*.direct_IO = */
 +};
-diff -urN linux-2.4.29.old/fs/cifs/inode.c linux-2.4.29/fs/cifs/inode.c
---- linux-2.4.29.old/fs/cifs/inode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/inode.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/inode.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/inode.c	2007-12-15 05:19:52.299401411 +0100
 @@ -0,0 +1,1079 @@
 +/*
 + *   fs/cifs/inode.c
@@ -16227,9 +16251,10 @@ diff -urN linux-2.4.29.old/fs/cifs/inode.c linux-2.4.29/fs/cifs/inode.c
 +	/* may have to add back in if and when safe distributed caching of
 +		directories added e.g. via FindNotify */
 +}
-diff -urN linux-2.4.29.old/fs/cifs/link.c linux-2.4.29/fs/cifs/link.c
---- linux-2.4.29.old/fs/cifs/link.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/link.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/link.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/link.c	2007-12-15 05:19:52.299401411 +0100
 @@ -0,0 +1,328 @@
 +/*
 + *   fs/cifs/link.c
@@ -16559,9 +16584,10 @@ diff -urN linux-2.4.29.old/fs/cifs/link.c linux-2.4.29/fs/cifs/link.c
 +	FreeXid(xid);
 +	return rc;
 +}
-diff -urN linux-2.4.29.old/fs/cifs/Makefile linux-2.4.29/fs/cifs/Makefile
---- linux-2.4.29.old/fs/cifs/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/Makefile	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/Makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/Makefile	2007-12-15 05:19:52.303401640 +0100
 @@ -0,0 +1,10 @@
 +#
 +# Makefile for Linux CIFS VFS client 
@@ -16573,9 +16599,10 @@ diff -urN linux-2.4.29.old/fs/cifs/Makefile linux-2.4.29/fs/cifs/Makefile
 +obj-m := $(O_TARGET)
 +
 +include $(TOPDIR)/Rules.make
-diff -urN linux-2.4.29.old/fs/cifs/md4.c linux-2.4.29/fs/cifs/md4.c
---- linux-2.4.29.old/fs/cifs/md4.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/md4.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/md4.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/md4.c	2007-12-15 05:19:52.303401640 +0100
 @@ -0,0 +1,203 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -16780,9 +16807,10 @@ diff -urN linux-2.4.29.old/fs/cifs/md4.c linux-2.4.29/fs/cifs/md4.c
 +
 +	A = B = C = D = 0;
 +}
-diff -urN linux-2.4.29.old/fs/cifs/md5.c linux-2.4.29/fs/cifs/md5.c
---- linux-2.4.29.old/fs/cifs/md5.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/md5.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/md5.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/md5.c	2007-12-15 05:19:52.303401640 +0100
 @@ -0,0 +1,363 @@
 +/*
 + * This code implements the MD5 message-digest algorithm.
@@ -17147,9 +17175,10 @@ diff -urN linux-2.4.29.old/fs/cifs/md5.c linux-2.4.29/fs/cifs/md5.c
 +	}
 +	hmac_md5_final(digest, &ctx);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/md5.h linux-2.4.29/fs/cifs/md5.h
---- linux-2.4.29.old/fs/cifs/md5.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/md5.h	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/md5.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/md5.h	2007-12-15 05:19:52.303401640 +0100
 @@ -0,0 +1,38 @@
 +#ifndef MD5_H
 +#define MD5_H
@@ -17189,9 +17218,10 @@ diff -urN linux-2.4.29.old/fs/cifs/md5.h linux-2.4.29/fs/cifs/md5.h
 +void hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx);
 +void hmac_md5(unsigned char key[16], unsigned char *data, int data_len,
 +			unsigned char *digest);
-diff -urN linux-2.4.29.old/fs/cifs/misc.c linux-2.4.29/fs/cifs/misc.c
---- linux-2.4.29.old/fs/cifs/misc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/misc.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/misc.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/misc.c	2007-12-15 05:19:52.307401866 +0100
 @@ -0,0 +1,463 @@
 +/*
 + *   fs/cifs/misc.c
@@ -17656,9 +17686,10 @@ diff -urN linux-2.4.29.old/fs/cifs/misc.c linux-2.4.29/fs/cifs/misc.c
 +	printk( " | %s\n", debug_line);
 +	return;
 +}
-diff -urN linux-2.4.29.old/fs/cifs/netmisc.c linux-2.4.29/fs/cifs/netmisc.c
---- linux-2.4.29.old/fs/cifs/netmisc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/netmisc.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/netmisc.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/netmisc.c	2007-12-15 05:19:52.307401866 +0100
 @@ -0,0 +1,905 @@
 +/*
 + *   fs/cifs/netmisc.c
@@ -18565,9 +18596,10 @@ diff -urN linux-2.4.29.old/fs/cifs/netmisc.c linux-2.4.29/fs/cifs/netmisc.c
 +	dce_time += NTFS_TIME_OFFSET;
 +	return dce_time;
 +}
-diff -urN linux-2.4.29.old/fs/cifs/nterr.c linux-2.4.29/fs/cifs/nterr.c
---- linux-2.4.29.old/fs/cifs/nterr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/nterr.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/nterr.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/nterr.c	2007-12-15 05:19:52.307401866 +0100
 @@ -0,0 +1,687 @@
 +/* 
 + *  Unix SMB/Netbios implementation.
@@ -19256,9 +19288,10 @@ diff -urN linux-2.4.29.old/fs/cifs/nterr.c linux-2.4.29/fs/cifs/nterr.c
 +	{"STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED},
 +	{NULL, 0}
 +};
-diff -urN linux-2.4.29.old/fs/cifs/nterr.h linux-2.4.29/fs/cifs/nterr.h
---- linux-2.4.29.old/fs/cifs/nterr.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/nterr.h	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/nterr.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/nterr.h	2007-12-15 05:19:52.311402095 +0100
 @@ -0,0 +1,556 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -19816,9 +19849,10 @@ diff -urN linux-2.4.29.old/fs/cifs/nterr.h linux-2.4.29/fs/cifs/nterr.h
 +#define NT_STATUS_NO_SUCH_JOB 0xC0000000 | 0xEDE	/* scheduler */
 +
 +#endif				/* _NTERR_H */
-diff -urN linux-2.4.29.old/fs/cifs/ntlmssp.h linux-2.4.29/fs/cifs/ntlmssp.h
---- linux-2.4.29.old/fs/cifs/ntlmssp.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/ntlmssp.h	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/ntlmssp.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/ntlmssp.h	2007-12-15 05:19:52.311402095 +0100
 @@ -0,0 +1,101 @@
 +/*
 + *   fs/cifs/ntlmssp.h
@@ -19921,9 +19955,10 @@ diff -urN linux-2.4.29.old/fs/cifs/ntlmssp.h linux-2.4.29/fs/cifs/ntlmssp.h
 +} AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE;
 +
 +#pragma pack()			/* resume default structure packing */
-diff -urN linux-2.4.29.old/fs/cifs/README linux-2.4.29/fs/cifs/README
---- linux-2.4.29.old/fs/cifs/README	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/README	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/README
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/README	2007-12-15 05:19:52.311402095 +0100
 @@ -0,0 +1,356 @@
 +The CIFS VFS support for Linux supports many advanced network filesystem 
 +features such as heirarchical dfs like namespace, hardlinks, locking and more.  
@@ -20281,9 +20316,10 @@ diff -urN linux-2.4.29.old/fs/cifs/README linux-2.4.29/fs/cifs/README
 +Windows 2000 server or Samba since it does not usually send "raw NTLMSSP" 
 +(instead it sends NTLMSSP encapsulated in SPNEGO/GSSAPI, which support is not 
 +complete in the CIFS VFS yet).  
-diff -urN linux-2.4.29.old/fs/cifs/rfc1002pdu.h linux-2.4.29/fs/cifs/rfc1002pdu.h
---- linux-2.4.29.old/fs/cifs/rfc1002pdu.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/rfc1002pdu.h	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/rfc1002pdu.h	2007-12-15 05:19:52.311402095 +0100
 @@ -0,0 +1,79 @@
 +/*
 + *   fs/cifs/rfc1002pdu.h
@@ -20364,9 +20400,10 @@ diff -urN linux-2.4.29.old/fs/cifs/rfc1002pdu.h linux-2.4.29/fs/cifs/rfc1002pdu.
 +
 +#pragma pack()		/* resume default structure packing */
 +                                                             
-diff -urN linux-2.4.29.old/fs/cifs/smbdes.c linux-2.4.29/fs/cifs/smbdes.c
---- linux-2.4.29.old/fs/cifs/smbdes.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/smbdes.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/smbdes.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/smbdes.c	2007-12-15 05:19:52.315402324 +0100
 @@ -0,0 +1,408 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -20776,9 +20813,10 @@ diff -urN linux-2.4.29.old/fs/cifs/smbdes.c linux-2.4.29/fs/cifs/smbdes.c
 +	key2[0] = key[7];
 +	smbhash(out + 8, in + 8, key2, forw);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/smbencrypt.c linux-2.4.29/fs/cifs/smbencrypt.c
---- linux-2.4.29.old/fs/cifs/smbencrypt.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/smbencrypt.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/smbencrypt.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/smbencrypt.c	2007-12-15 05:19:52.315402324 +0100
 @@ -0,0 +1,295 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -21075,9 +21113,10 @@ diff -urN linux-2.4.29.old/fs/cifs/smbencrypt.c linux-2.4.29/fs/cifs/smbencrypt.
 +{
 +	mdfour((unsigned char *) sess_key, (unsigned char *) kr, 16);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/smberr.c linux-2.4.29/fs/cifs/smberr.c
---- linux-2.4.29.old/fs/cifs/smberr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/smberr.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/smberr.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/smberr.c	2007-12-15 05:19:52.315402324 +0100
 @@ -0,0 +1,240 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -21319,9 +21358,10 @@ diff -urN linux-2.4.29.old/fs/cifs/smberr.c linux-2.4.29/fs/cifs/smberr.c
 +	NTSTATUS status = map_nt_error_from_unix(error);
 +	return ntstatus_to_werror(status);
 +}
-diff -urN linux-2.4.29.old/fs/cifs/smberr.h linux-2.4.29/fs/cifs/smberr.h
---- linux-2.4.29.old/fs/cifs/smberr.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/smberr.h	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/smberr.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/smberr.h	2007-12-15 05:19:52.315402324 +0100
 @@ -0,0 +1,113 @@
 +/*
 + *   fs/cifs/smberr.h
@@ -21436,9 +21476,10 @@ diff -urN linux-2.4.29.old/fs/cifs/smberr.h linux-2.4.29/fs/cifs/smberr.h
 +#define ERRpasswordExpired 2242
 +#define ERRnetlogonNotStarted 2455
 +#define ERRnosupport       0xFFFF
-diff -urN linux-2.4.29.old/fs/cifs/TODO linux-2.4.29/fs/cifs/TODO
---- linux-2.4.29.old/fs/cifs/TODO	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/TODO	2004-07-14 00:25:04.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/TODO
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/TODO	2007-12-15 05:19:52.315402324 +0100
 @@ -0,0 +1,106 @@
 +version 1.16 May 27, 2004
 +
@@ -21546,9 +21587,10 @@ diff -urN linux-2.4.29.old/fs/cifs/TODO linux-2.4.29/fs/cifs/TODO
 +4) More exhaustively test the recently added NT4 support against various
 +NT4 service pack levels.
 +
-diff -urN linux-2.4.29.old/fs/cifs/transport.c linux-2.4.29/fs/cifs/transport.c
---- linux-2.4.29.old/fs/cifs/transport.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/fs/cifs/transport.c	2004-07-14 00:25:05.000000000 +0200
+Index: linux-2.4.35.4/fs/cifs/transport.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/cifs/transport.c	2007-12-15 05:19:52.319402550 +0100
 @@ -0,0 +1,434 @@
 +/*
 + *   fs/cifs/transport.c
@@ -21984,10 +22026,11 @@ diff -urN linux-2.4.29.old/fs/cifs/transport.c linux-2.4.29/fs/cifs/transport.c
 +
 +	return rc;
 +}
-diff -urN linux-2.4.29.old/fs/Config.in linux-2.4.29/fs/Config.in
---- linux-2.4.29.old/fs/Config.in	2005-03-21 19:30:22.000000000 +0100
-+++ linux-2.4.29/fs/Config.in	2005-03-21 19:36:51.000000000 +0100
-@@ -146,6 +146,10 @@
+Index: linux-2.4.35.4/fs/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/fs/Config.in	2007-12-15 05:19:49.287229757 +0100
++++ linux-2.4.35.4/fs/Config.in	2007-12-15 05:19:52.319402550 +0100
+@@ -153,6 +153,10 @@
       define_bool CONFIG_LOCKD_V4 y
     fi
  
@@ -21998,9 +22041,10 @@ diff -urN linux-2.4.29.old/fs/Config.in linux-2.4.29/fs/Config.in
     dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET
     if [ "$CONFIG_SMB_FS" != "n" ]; then
        bool '  Use a default NLS' CONFIG_SMB_NLS_DEFAULT
-diff -urN linux-2.4.29.old/fs/Makefile linux-2.4.29/fs/Makefile
---- linux-2.4.29.old/fs/Makefile	2005-03-21 19:30:22.000000000 +0100
-+++ linux-2.4.29/fs/Makefile	2005-03-21 19:36:51.000000000 +0100
+Index: linux-2.4.35.4/fs/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/fs/Makefile	2007-12-15 05:19:48.639192828 +0100
++++ linux-2.4.35.4/fs/Makefile	2007-12-15 05:19:52.319402550 +0100
 @@ -37,6 +37,7 @@
  subdir-$(CONFIG_VFAT_FS)	+= vfat
  subdir-$(CONFIG_BFS_FS)		+= bfs
@@ -22009,9 +22053,10 @@ diff -urN linux-2.4.29.old/fs/Makefile linux-2.4.29/fs/Makefile
  subdir-$(CONFIG_DEVFS_FS)	+= devfs
  subdir-$(CONFIG_HFSPLUS_FS)	+= hfsplus # Before hfs to find wrapped HFS+
  subdir-$(CONFIG_HFS_FS)		+= hfs
-diff -urN linux-2.4.29.old/fs/nls/Config.in linux-2.4.29/fs/nls/Config.in
---- linux-2.4.29.old/fs/nls/Config.in	2003-08-25 13:44:43.000000000 +0200
-+++ linux-2.4.29/fs/nls/Config.in	2005-03-21 19:36:51.000000000 +0100
+Index: linux-2.4.35.4/fs/nls/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/fs/nls/Config.in	2007-12-15 05:19:42.058817832 +0100
++++ linux-2.4.35.4/fs/nls/Config.in	2007-12-15 05:19:52.319402550 +0100
 @@ -11,6 +11,7 @@
  
  # msdos and Joliet want NLS
diff --git a/target/linux/generic-2.4/patches/108-optional_aout_support.patch b/target/linux/generic-2.4/patches/108-optional_aout_support.patch
index 56dc1991cf..5874007f59 100644
--- a/target/linux/generic-2.4/patches/108-optional_aout_support.patch
+++ b/target/linux/generic-2.4/patches/108-optional_aout_support.patch
@@ -1,9 +1,10 @@
-diff -urPX nopatch linux-2.4.26/Documentation/Configure.help linux/Documentation/Configure.help
---- linux-2.4.26/Documentation/Configure.help	Sat Apr 17 02:10:25 2004
-+++ linux/Documentation/Configure.help	Sat Apr 17 02:13:54 2004
-@@ -4622,6 +4622,12 @@
-   will be called binfmt_elf.o. Saying M or N here is dangerous because
-   some crucial programs on your system might be in ELF format.
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:19:52.251398675 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:19:53.139449282 +0100
+@@ -4690,6 +4690,12 @@
+   ld.so (check the file <file:Documentation/Changes> for location and
+   latest version).
  
 +ELF binaries with a.out format interpreters or a.out libraries
 +CONFIG_BINFMT_ELF_AOUT
@@ -14,7 +15,7 @@ diff -urPX nopatch linux-2.4.26/Documentation/Configure.help linux/Documentation
  Kernel support for a.out binaries
  CONFIG_BINFMT_AOUT
    A.out (Assembler.OUTput) is a set of formats for libraries and
-@@ -4635,13 +4641,11 @@
+@@ -4703,13 +4709,11 @@
    warrant removing support. However its removal is a good idea if you
    wish to ensure that absolutely none of your programs will use this
    older executable format. If you don't know what to answer at this
@@ -30,9 +31,10 @@ diff -urPX nopatch linux-2.4.26/Documentation/Configure.help linux/Documentation
  
  OSF/1 v4 readv/writev compatibility
  CONFIG_OSF4_COMPAT
-diff -urPX nopatch linux-2.4.26/arch/alpha/config.in linux/arch/alpha/config.in
---- linux-2.4.26/arch/alpha/config.in	Fri Feb 20 10:07:20 2004
-+++ linux/arch/alpha/config.in	Sat Apr 17 02:13:54 2004
+Index: linux-2.4.35.4/arch/alpha/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/alpha/config.in	2007-12-15 05:19:41.518787058 +0100
++++ linux-2.4.35.4/arch/alpha/config.in	2007-12-15 05:19:53.143449511 +0100
 @@ -315,6 +315,9 @@
  fi
  
@@ -43,9 +45,10 @@ diff -urPX nopatch linux-2.4.26/arch/alpha/config.in linux/arch/alpha/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  tristate 'Kernel support for Linux/Intel ELF binaries' CONFIG_BINFMT_EM86
  source drivers/parport/Config.in
-diff -urPX nopatch linux-2.4.26/arch/alpha/defconfig linux/arch/alpha/defconfig
---- linux-2.4.26/arch/alpha/defconfig	Fri Feb 20 10:07:20 2004
-+++ linux/arch/alpha/defconfig	Sat Apr 17 02:13:54 2004
+Index: linux-2.4.35.4/arch/alpha/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/alpha/defconfig	2007-12-15 05:19:41.526787516 +0100
++++ linux-2.4.35.4/arch/alpha/defconfig	2007-12-15 05:19:53.143449511 +0100
 @@ -72,6 +72,7 @@
  # CONFIG_KCORE_AOUT is not set
  # CONFIG_BINFMT_AOUT is not set
@@ -54,9 +57,10 @@ diff -urPX nopatch linux-2.4.26/arch/alpha/defconfig linux/arch/alpha/defconfig
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_BINFMT_EM86 is not set
  
-diff -urPX nopatch linux-2.4.26/arch/arm/config.in linux/arch/arm/config.in
---- linux-2.4.26/arch/arm/config.in	Fri Feb 20 10:07:20 2004
-+++ linux/arch/arm/config.in	Sat Apr 17 02:13:54 2004
+Index: linux-2.4.35.4/arch/arm/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/arm/config.in	2007-12-15 05:19:41.534787971 +0100
++++ linux-2.4.35.4/arch/arm/config.in	2007-12-15 05:19:53.143449511 +0100
 @@ -499,6 +499,9 @@
  	 A.OUT		CONFIG_KCORE_AOUT" ELF
  tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
@@ -67,9 +71,10 @@ diff -urPX nopatch linux-2.4.26/arch/arm/config.in linux/arch/arm/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  dep_bool 'Power Management support (experimental)' CONFIG_PM $CONFIG_EXPERIMENTAL
  dep_tristate 'RISC OS personality' CONFIG_ARTHUR $CONFIG_CPU_32
-diff -urPX nopatch linux-2.4.26/arch/arm/defconfig linux/arch/arm/defconfig
---- linux-2.4.26/arch/arm/defconfig	Fri Feb 20 10:07:21 2004
-+++ linux/arch/arm/defconfig	Sat Apr 17 02:13:54 2004
+Index: linux-2.4.35.4/arch/arm/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/arm/defconfig	2007-12-15 05:19:41.542788427 +0100
++++ linux-2.4.35.4/arch/arm/defconfig	2007-12-15 05:19:53.143449511 +0100
 @@ -83,8 +83,9 @@
  CONFIG_NWFPE=y
  CONFIG_KCORE_ELF=y
@@ -81,9 +86,10 @@ diff -urPX nopatch linux-2.4.26/arch/arm/defconfig linux/arch/arm/defconfig
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_PM is not set
  # CONFIG_ARTHUR is not set
-diff -urPX nopatch linux-2.4.26/arch/cris/config.in linux/arch/cris/config.in
---- linux-2.4.26/arch/cris/config.in	Fri Feb 20 10:07:21 2004
-+++ linux/arch/cris/config.in	Sat Apr 17 02:13:54 2004
+Index: linux-2.4.35.4/arch/cris/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/cris/config.in	2007-12-15 05:19:41.550788882 +0100
++++ linux-2.4.35.4/arch/cris/config.in	2007-12-15 05:19:53.143449511 +0100
 @@ -31,6 +31,9 @@
  bool 'Sysctl support' CONFIG_SYSCTL
  
@@ -94,9 +100,10 @@ diff -urPX nopatch linux-2.4.26/arch/cris/config.in linux/arch/cris/config.in
  
  string 'Kernel command line' CONFIG_ETRAX_CMDLINE "root=/dev/mtdblock3"
  
-diff -urPX nopatch linux-2.4.26/arch/cris/defconfig linux/arch/cris/defconfig
---- linux-2.4.26/arch/cris/defconfig	Fri Feb 20 10:07:21 2004
-+++ linux/arch/cris/defconfig	Sat Apr 17 02:13:54 2004
+Index: linux-2.4.35.4/arch/cris/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/cris/defconfig	2007-12-15 05:19:41.554789111 +0100
++++ linux-2.4.35.4/arch/cris/defconfig	2007-12-15 05:19:53.147449737 +0100
 @@ -18,6 +18,7 @@
  # CONFIG_BSD_PROCESS_ACCT is not set
  # CONFIG_SYSCTL is not set
@@ -105,10 +112,11 @@ diff -urPX nopatch linux-2.4.26/arch/cris/defconfig linux/arch/cris/defconfig
  # CONFIG_ETRAX_KGDB is not set
  # CONFIG_ETRAX_WATCHDOG is not set
  
-diff -urPX nopatch linux-2.4.26/arch/i386/config.in linux/arch/i386/config.in
---- linux-2.4.26/arch/i386/config.in	Fri Feb 20 10:07:21 2004
-+++ linux/arch/i386/config.in	Sat Apr 17 02:13:54 2004
-@@ -327,6 +327,9 @@
+Index: linux-2.4.35.4/arch/i386/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/i386/config.in	2007-12-15 05:19:41.562789566 +0100
++++ linux-2.4.35.4/arch/i386/config.in	2007-12-15 05:19:53.147449737 +0100
+@@ -329,6 +329,9 @@
  fi
  tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
  bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@@ -118,10 +126,11 @@ diff -urPX nopatch linux-2.4.26/arch/i386/config.in linux/arch/i386/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
  
-diff -urPX nopatch linux-2.4.26/arch/i386/defconfig linux/arch/i386/defconfig
---- linux-2.4.26/arch/i386/defconfig	Sat Apr 17 02:10:25 2004
-+++ linux/arch/i386/defconfig	Sat Apr 17 02:23:27 2004
-@@ -110,9 +110,10 @@
+Index: linux-2.4.35.4/arch/i386/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/i386/defconfig	2007-12-15 05:19:41.570790022 +0100
++++ linux-2.4.35.4/arch/i386/defconfig	2007-12-15 05:19:53.147449737 +0100
+@@ -115,9 +115,10 @@
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
  # CONFIG_KCORE_AOUT is not set
@@ -134,9 +143,10 @@ diff -urPX nopatch linux-2.4.26/arch/i386/defconfig linux/arch/i386/defconfig
  # CONFIG_OOM_KILLER is not set
  CONFIG_PM=y
  # CONFIG_APM is not set
-diff -urPX nopatch linux-2.4.26/arch/ia64/config.in linux/arch/ia64/config.in
---- linux-2.4.26/arch/ia64/config.in	Fri Feb 20 10:07:21 2004
-+++ linux/arch/ia64/config.in	Sat Apr 17 02:13:54 2004
+Index: linux-2.4.35.4/arch/ia64/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/ia64/config.in	2007-12-15 05:19:41.578790477 +0100
++++ linux-2.4.35.4/arch/ia64/config.in	2007-12-15 05:19:53.147449737 +0100
 @@ -124,6 +124,9 @@
  bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
  bool 'Sysctl support' CONFIG_SYSCTL
@@ -147,9 +157,10 @@ diff -urPX nopatch linux-2.4.26/arch/ia64/config.in linux/arch/ia64/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  
  if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
-diff -urPX nopatch linux-2.4.26/arch/ia64/defconfig linux/arch/ia64/defconfig
---- linux-2.4.26/arch/ia64/defconfig	Fri Feb 20 10:07:21 2004
-+++ linux/arch/ia64/defconfig	Sat Apr 17 02:13:54 2004
+Index: linux-2.4.35.4/arch/ia64/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/ia64/defconfig	2007-12-15 05:19:41.586790935 +0100
++++ linux-2.4.35.4/arch/ia64/defconfig	2007-12-15 05:19:53.151449966 +0100
 @@ -60,6 +60,7 @@
  # CONFIG_BSD_PROCESS_ACCT is not set
  CONFIG_SYSCTL=y
@@ -158,9 +169,10 @@ diff -urPX nopatch linux-2.4.26/arch/ia64/defconfig linux/arch/ia64/defconfig
  # CONFIG_BINFMT_MISC is not set
  CONFIG_ACPI=y
  CONFIG_ACPI_EFI=y
-diff -urPX nopatch linux-2.4.26/arch/m68k/config.in linux/arch/m68k/config.in
---- linux-2.4.26/arch/m68k/config.in	Fri Feb 20 10:07:22 2004
-+++ linux/arch/m68k/config.in	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/m68k/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/m68k/config.in	2007-12-15 05:19:41.594791391 +0100
++++ linux-2.4.35.4/arch/m68k/config.in	2007-12-15 05:19:53.151449966 +0100
 @@ -99,6 +99,9 @@
  fi
  tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
@@ -171,9 +183,10 @@ diff -urPX nopatch linux-2.4.26/arch/m68k/config.in linux/arch/m68k/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  
  if [ "$CONFIG_AMIGA" = "y" ]; then
-diff -urPX nopatch linux-2.4.26/arch/m68k/defconfig linux/arch/m68k/defconfig
---- linux-2.4.26/arch/m68k/defconfig	Fri Feb 20 10:07:22 2004
-+++ linux/arch/m68k/defconfig	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/m68k/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/m68k/defconfig	2007-12-15 05:19:41.602791846 +0100
++++ linux-2.4.35.4/arch/m68k/defconfig	2007-12-15 05:19:53.151449966 +0100
 @@ -44,8 +44,9 @@
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -185,10 +198,11 @@ diff -urPX nopatch linux-2.4.26/arch/m68k/defconfig linux/arch/m68k/defconfig
  # CONFIG_BINFMT_MISC is not set
  CONFIG_ZORRO=y
  # CONFIG_AMIGA_PCMCIA is not set
-diff -urPX nopatch linux-2.4.26/arch/mips/config-shared.in linux/arch/mips/config-shared.in
---- linux-2.4.26/arch/mips/config-shared.in	Fri Feb 20 10:07:22 2004
-+++ linux/arch/mips/config-shared.in	Sat Apr 17 02:13:55 2004
-@@ -944,6 +944,9 @@
+Index: linux-2.4.35.4/arch/mips/config-shared.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/config-shared.in	2007-12-15 05:19:44.814974898 +0100
++++ linux-2.4.35.4/arch/mips/config-shared.in	2007-12-15 05:19:53.151449966 +0100
+@@ -873,6 +873,9 @@
  define_bool CONFIG_KCORE_AOUT n
  define_bool CONFIG_BINFMT_AOUT n
  bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
@@ -198,10 +212,11 @@ diff -urPX nopatch linux-2.4.26/arch/mips/config-shared.in linux/arch/mips/confi
  dep_bool 'Kernel support for Linux/MIPS 32-bit binary compatibility' CONFIG_MIPS32_COMPAT $CONFIG_MIPS64
  dep_bool 'Kernel support for o32 binaries' CONFIG_MIPS32_O32 $CONFIG_MIPS32_COMPAT
  dep_bool 'Kernel support for n32 binaries' CONFIG_MIPS32_N32 $CONFIG_MIPS32_COMPAT
-diff -urPX nopatch linux-2.4.26/arch/mips/defconfig linux/arch/mips/defconfig
---- linux-2.4.26/arch/mips/defconfig	Fri Feb 20 10:07:22 2004
-+++ linux/arch/mips/defconfig	Sat Apr 17 02:13:55 2004
-@@ -139,6 +139,7 @@
+Index: linux-2.4.35.4/arch/mips/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/defconfig	2007-12-15 05:19:44.814974898 +0100
++++ linux-2.4.35.4/arch/mips/defconfig	2007-12-15 05:19:53.155450196 +0100
+@@ -143,6 +143,7 @@
  # CONFIG_KCORE_AOUT is not set
  # CONFIG_BINFMT_AOUT is not set
  CONFIG_BINFMT_ELF=y
@@ -209,9 +224,10 @@ diff -urPX nopatch linux-2.4.26/arch/mips/defconfig linux/arch/mips/defconfig
  # CONFIG_MIPS32_COMPAT is not set
  # CONFIG_MIPS32_O32 is not set
  # CONFIG_MIPS32_N32 is not set
-diff -urPX nopatch linux-2.4.26/arch/mips/kernel/irixelf.c linux/arch/mips/kernel/irixelf.c
---- linux-2.4.26/arch/mips/kernel/irixelf.c	Mon Aug 25 11:44:40 2003
-+++ linux/arch/mips/kernel/irixelf.c	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/irixelf.c	2007-12-15 05:19:41.626793215 +0100
++++ linux-2.4.35.4/arch/mips/kernel/irixelf.c	2007-12-15 05:19:53.155450196 +0100
 @@ -8,6 +8,7 @@
   * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com).
   */
@@ -234,7 +250,7 @@ diff -urPX nopatch linux-2.4.26/arch/mips/kernel/irixelf.c linux/arch/mips/kerne
  	irix_core_dump, PAGE_SIZE
  };
  
-@@ -787,6 +793,7 @@
+@@ -794,6 +800,7 @@
  	goto out;
  }
  
@@ -242,7 +258,7 @@ diff -urPX nopatch linux-2.4.26/arch/mips/kernel/irixelf.c linux/arch/mips/kerne
  /* This is really simpleminded and specialized - we are loading an
   * a.out library that is given an ELF header.
   */
-@@ -863,6 +870,7 @@
+@@ -873,6 +880,7 @@
  	kfree(elf_phdata);
  	return 0;
  }
@@ -250,10 +266,11 @@ diff -urPX nopatch linux-2.4.26/arch/mips/kernel/irixelf.c linux/arch/mips/kerne
  
  /* Called through irix_syssgi() to map an elf image given an FD,
   * a phdr ptr USER_PHDRP in userspace, and a count CNT telling how many
-diff -urPX nopatch linux-2.4.26/arch/mips64/defconfig linux/arch/mips64/defconfig
---- linux-2.4.26/arch/mips64/defconfig	Fri Feb 20 10:07:24 2004
-+++ linux/arch/mips64/defconfig	Sat Apr 17 02:13:55 2004
-@@ -137,6 +137,7 @@
+Index: linux-2.4.35.4/arch/mips64/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/defconfig	2007-12-15 05:19:44.874978317 +0100
++++ linux-2.4.35.4/arch/mips64/defconfig	2007-12-15 05:19:53.155450196 +0100
+@@ -147,6 +147,7 @@
  # CONFIG_KCORE_AOUT is not set
  # CONFIG_BINFMT_AOUT is not set
  CONFIG_BINFMT_ELF=y
@@ -261,9 +278,10 @@ diff -urPX nopatch linux-2.4.26/arch/mips64/defconfig linux/arch/mips64/defconfi
  CONFIG_MIPS32_COMPAT=y
  CONFIG_MIPS32_O32=y
  # CONFIG_MIPS32_N32 is not set
-diff -urPX nopatch linux-2.4.26/arch/parisc/config.in linux/arch/parisc/config.in
---- linux-2.4.26/arch/parisc/config.in	Fri Feb 20 10:07:25 2004
-+++ linux/arch/parisc/config.in	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/parisc/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/parisc/config.in	2007-12-15 05:19:41.638793897 +0100
++++ linux-2.4.35.4/arch/parisc/config.in	2007-12-15 05:19:53.155450196 +0100
 @@ -89,6 +89,9 @@
  bool 'Sysctl support' CONFIG_SYSCTL
  define_bool CONFIG_KCORE_ELF y
@@ -274,9 +292,10 @@ diff -urPX nopatch linux-2.4.26/arch/parisc/config.in linux/arch/parisc/config.i
  tristate 'Kernel support for SOM binaries' CONFIG_BINFMT_SOM
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  
-diff -urPX nopatch linux-2.4.26/arch/parisc/defconfig linux/arch/parisc/defconfig
---- linux-2.4.26/arch/parisc/defconfig	Fri Feb 20 10:07:25 2004
-+++ linux/arch/parisc/defconfig	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/parisc/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/parisc/defconfig	2007-12-15 05:19:41.646794355 +0100
++++ linux-2.4.35.4/arch/parisc/defconfig	2007-12-15 05:19:53.159450422 +0100
 @@ -56,6 +56,7 @@
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -285,9 +304,10 @@ diff -urPX nopatch linux-2.4.26/arch/parisc/defconfig linux/arch/parisc/defconfi
  CONFIG_BINFMT_SOM=y
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_PM is not set
-diff -urPX nopatch linux-2.4.26/arch/ppc/config.in linux/arch/ppc/config.in
---- linux-2.4.26/arch/ppc/config.in	Sat Apr 17 02:10:25 2004
-+++ linux/arch/ppc/config.in	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/ppc/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/ppc/config.in	2007-12-15 05:19:41.654794810 +0100
++++ linux-2.4.35.4/arch/ppc/config.in	2007-12-15 05:19:53.159450422 +0100
 @@ -384,6 +384,7 @@
  fi
  define_bool CONFIG_BINFMT_ELF y
@@ -296,9 +316,10 @@ diff -urPX nopatch linux-2.4.26/arch/ppc/config.in linux/arch/ppc/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
  
-diff -urPX nopatch linux-2.4.26/arch/ppc/defconfig linux/arch/ppc/defconfig
---- linux-2.4.26/arch/ppc/defconfig	Fri Feb 20 10:07:25 2004
-+++ linux/arch/ppc/defconfig	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/ppc/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/ppc/defconfig	2007-12-15 05:19:41.662795265 +0100
++++ linux-2.4.35.4/arch/ppc/defconfig	2007-12-15 05:19:53.159450422 +0100
 @@ -59,7 +59,8 @@
  CONFIG_KCORE_ELF=y
  CONFIG_BINFMT_ELF=y
@@ -309,9 +330,10 @@ diff -urPX nopatch linux-2.4.26/arch/ppc/defconfig linux/arch/ppc/defconfig
  # CONFIG_OOM_KILLER is not set
  CONFIG_PCI_NAMES=y
  CONFIG_HOTPLUG=y
-diff -urPX nopatch linux-2.4.26/arch/ppc64/config.in linux/arch/ppc64/config.in
---- linux-2.4.26/arch/ppc64/config.in	Fri Feb 20 10:07:25 2004
-+++ linux/arch/ppc64/config.in	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/ppc64/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/ppc64/config.in	2007-12-15 05:19:41.670795721 +0100
++++ linux-2.4.35.4/arch/ppc64/config.in	2007-12-15 05:19:53.159450422 +0100
 @@ -82,6 +82,9 @@
  fi
  
@@ -322,9 +344,10 @@ diff -urPX nopatch linux-2.4.26/arch/ppc64/config.in linux/arch/ppc64/config.in
  
  tristate 'Kernel support for 32 bit ELF binaries' CONFIG_BINFMT_ELF32
  
-diff -urPX nopatch linux-2.4.26/arch/ppc64/defconfig linux/arch/ppc64/defconfig
---- linux-2.4.26/arch/ppc64/defconfig	Fri Feb 20 10:07:25 2004
-+++ linux/arch/ppc64/defconfig	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/ppc64/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/ppc64/defconfig	2007-12-15 05:19:41.678796176 +0100
++++ linux-2.4.35.4/arch/ppc64/defconfig	2007-12-15 05:19:53.163450651 +0100
 @@ -56,6 +56,7 @@
  # CONFIG_BSD_PROCESS_ACCT is not set
  CONFIG_KCORE_ELF=y
@@ -333,9 +356,10 @@ diff -urPX nopatch linux-2.4.26/arch/ppc64/defconfig linux/arch/ppc64/defconfig
  CONFIG_BINFMT_ELF32=y
  # CONFIG_BINFMT_MISC is not set
  CONFIG_PCI_NAMES=y
-diff -urPX nopatch linux-2.4.26/arch/s390/config.in linux/arch/s390/config.in
---- linux-2.4.26/arch/s390/config.in	Fri Nov 28 18:26:19 2003
-+++ linux/arch/s390/config.in	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/s390/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/s390/config.in	2007-12-15 05:19:41.686796634 +0100
++++ linux-2.4.35.4/arch/s390/config.in	2007-12-15 05:19:53.163450651 +0100
 @@ -58,6 +58,9 @@
  bool 'Sysctl support' CONFIG_SYSCTL
  define_bool CONFIG_KCORE_ELF y
@@ -346,9 +370,10 @@ diff -urPX nopatch linux-2.4.26/arch/s390/config.in linux/arch/s390/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG
  bool 'Pseudo page fault support' CONFIG_PFAULT
-diff -urPX nopatch linux-2.4.26/arch/s390/defconfig linux/arch/s390/defconfig
---- linux-2.4.26/arch/s390/defconfig	Fri Feb 20 10:07:26 2004
-+++ linux/arch/s390/defconfig	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/s390/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/s390/defconfig	2007-12-15 05:19:41.694797090 +0100
++++ linux-2.4.35.4/arch/s390/defconfig	2007-12-15 05:19:53.163450651 +0100
 @@ -46,6 +46,7 @@
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -357,9 +382,10 @@ diff -urPX nopatch linux-2.4.26/arch/s390/defconfig linux/arch/s390/defconfig
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_PROCESS_DEBUG is not set
  CONFIG_PFAULT=y
-diff -urPX nopatch linux-2.4.26/arch/s390x/config.in linux/arch/s390x/config.in
---- linux-2.4.26/arch/s390x/config.in	Fri Nov 28 18:26:19 2003
-+++ linux/arch/s390x/config.in	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/s390x/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/s390x/config.in	2007-12-15 05:19:41.698797316 +0100
++++ linux-2.4.35.4/arch/s390x/config.in	2007-12-15 05:19:53.163450651 +0100
 @@ -61,6 +61,9 @@
  bool 'Sysctl support' CONFIG_SYSCTL
  define_bool CONFIG_KCORE_ELF y
@@ -370,9 +396,10 @@ diff -urPX nopatch linux-2.4.26/arch/s390x/config.in linux/arch/s390x/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG
  bool 'Pseudo page fault support' CONFIG_PFAULT
-diff -urPX nopatch linux-2.4.26/arch/s390x/defconfig linux/arch/s390x/defconfig
---- linux-2.4.26/arch/s390x/defconfig	Fri Feb 20 10:07:26 2004
-+++ linux/arch/s390x/defconfig	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/s390x/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/s390x/defconfig	2007-12-15 05:19:41.706797774 +0100
++++ linux-2.4.35.4/arch/s390x/defconfig	2007-12-15 05:19:53.163450651 +0100
 @@ -47,6 +47,7 @@
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -381,9 +408,10 @@ diff -urPX nopatch linux-2.4.26/arch/s390x/defconfig linux/arch/s390x/defconfig
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_PROCESS_DEBUG is not set
  CONFIG_PFAULT=y
-diff -urPX nopatch linux-2.4.26/arch/sh/config.in linux/arch/sh/config.in
---- linux-2.4.26/arch/sh/config.in	Fri Feb 20 10:07:26 2004
-+++ linux/arch/sh/config.in	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/sh/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/sh/config.in	2007-12-15 05:19:41.714798229 +0100
++++ linux-2.4.35.4/arch/sh/config.in	2007-12-15 05:19:53.163450651 +0100
 @@ -283,6 +283,9 @@
  	 A.OUT		CONFIG_KCORE_AOUT" ELF
  fi
@@ -394,9 +422,10 @@ diff -urPX nopatch linux-2.4.26/arch/sh/config.in linux/arch/sh/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  
  bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
-diff -urPX nopatch linux-2.4.26/arch/sh/defconfig linux/arch/sh/defconfig
---- linux-2.4.26/arch/sh/defconfig	Fri Feb 20 10:07:26 2004
-+++ linux/arch/sh/defconfig	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/sh/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/sh/defconfig	2007-12-15 05:19:41.722798685 +0100
++++ linux-2.4.35.4/arch/sh/defconfig	2007-12-15 05:19:53.167450880 +0100
 @@ -48,6 +48,7 @@
  CONFIG_KCORE_ELF=y
  # CONFIG_KCORE_AOUT is not set
@@ -405,9 +434,10 @@ diff -urPX nopatch linux-2.4.26/arch/sh/defconfig linux/arch/sh/defconfig
  # CONFIG_BINFMT_MISC is not set
  
  #
-diff -urPX nopatch linux-2.4.26/arch/sparc/config.in linux/arch/sparc/config.in
---- linux-2.4.26/arch/sparc/config.in	Fri Feb 20 10:07:26 2004
-+++ linux/arch/sparc/config.in	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/sparc/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/sparc/config.in	2007-12-15 05:19:41.730799140 +0100
++++ linux-2.4.35.4/arch/sparc/config.in	2007-12-15 05:19:53.167450880 +0100
 @@ -74,6 +74,9 @@
  fi
  tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
@@ -418,9 +448,10 @@ diff -urPX nopatch linux-2.4.26/arch/sparc/config.in linux/arch/sparc/config.in
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL
  bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
-diff -urPX nopatch linux-2.4.26/arch/sparc/defconfig linux/arch/sparc/defconfig
---- linux-2.4.26/arch/sparc/defconfig	Sat Apr 17 02:10:25 2004
-+++ linux/arch/sparc/defconfig	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/sparc/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/sparc/defconfig	2007-12-15 05:19:41.738799596 +0100
++++ linux-2.4.35.4/arch/sparc/defconfig	2007-12-15 05:19:53.167450880 +0100
 @@ -49,9 +49,10 @@
  # CONFIG_BSD_PROCESS_ACCT is not set
  CONFIG_SYSCTL=y
@@ -434,10 +465,11 @@ diff -urPX nopatch linux-2.4.26/arch/sparc/defconfig linux/arch/sparc/defconfig
  CONFIG_SUNOS_EMUL=y
  # CONFIG_OOM_KILLER is not set
  
-diff -urPX nopatch linux-2.4.26/arch/sparc64/config.in linux/arch/sparc64/config.in
---- linux-2.4.26/arch/sparc64/config.in	Fri Feb 20 10:07:26 2004
-+++ linux/arch/sparc64/config.in	Sat Apr 17 02:13:55 2004
-@@ -77,6 +77,9 @@
+Index: linux-2.4.35.4/arch/sparc64/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/sparc64/config.in	2007-12-15 05:19:41.742799824 +0100
++++ linux-2.4.35.4/arch/sparc64/config.in	2007-12-15 05:19:53.167450880 +0100
+@@ -79,6 +79,9 @@
     bool '  Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32
  fi
  bool 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF
@@ -447,10 +479,11 @@ diff -urPX nopatch linux-2.4.26/arch/sparc64/config.in linux/arch/sparc64/config
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-diff -urPX nopatch linux-2.4.26/arch/sparc64/defconfig linux/arch/sparc64/defconfig
---- linux-2.4.26/arch/sparc64/defconfig	Sat Apr 17 02:10:26 2004
-+++ linux/arch/sparc64/defconfig	Sat Apr 17 02:13:55 2004
-@@ -56,7 +56,8 @@
+Index: linux-2.4.35.4/arch/sparc64/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/sparc64/defconfig	2007-12-15 05:19:41.750800280 +0100
++++ linux-2.4.35.4/arch/sparc64/defconfig	2007-12-15 05:19:53.167450880 +0100
+@@ -70,7 +70,8 @@
  CONFIG_BINFMT_ELF32=y
  # CONFIG_BINFMT_AOUT32 is not set
  CONFIG_BINFMT_ELF=y
@@ -460,9 +493,10 @@ diff -urPX nopatch linux-2.4.26/arch/sparc64/defconfig linux/arch/sparc64/defcon
  # CONFIG_SUNOS_EMUL is not set
  CONFIG_SOLARIS_EMUL=m
  # CONFIG_OOM_KILLER is not set
-diff -urPX nopatch linux-2.4.26/arch/x86_64/config.in linux/arch/x86_64/config.in
---- linux-2.4.26/arch/x86_64/config.in	Sat Apr 17 02:10:26 2004
-+++ linux/arch/x86_64/config.in	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/x86_64/config.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/x86_64/config.in	2007-12-15 05:19:41.758800735 +0100
++++ linux-2.4.35.4/arch/x86_64/config.in	2007-12-15 05:19:53.171451107 +0100
 @@ -118,6 +118,9 @@
  fi
  #tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
@@ -473,9 +507,10 @@ diff -urPX nopatch linux-2.4.26/arch/x86_64/config.in linux/arch/x86_64/config.i
  tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
  
  bool 'Power Management support' CONFIG_PM
-diff -urPX nopatch linux-2.4.26/arch/x86_64/defconfig linux/arch/x86_64/defconfig
---- linux-2.4.26/arch/x86_64/defconfig	Sat Apr 17 02:10:26 2004
-+++ linux/arch/x86_64/defconfig	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/arch/x86_64/defconfig
+===================================================================
+--- linux-2.4.35.4.orig/arch/x86_64/defconfig	2007-12-15 05:19:41.766801193 +0100
++++ linux-2.4.35.4/arch/x86_64/defconfig	2007-12-15 05:19:53.171451107 +0100
 @@ -67,6 +67,7 @@
  CONFIG_SYSCTL=y
  CONFIG_KCORE_ELF=y
@@ -484,9 +519,10 @@ diff -urPX nopatch linux-2.4.26/arch/x86_64/defconfig linux/arch/x86_64/defconfi
  # CONFIG_BINFMT_MISC is not set
  CONFIG_PM=y
  CONFIG_IA32_EMULATION=y
-diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
---- linux-2.4.26/fs/binfmt_elf.c	Sat Apr 17 02:10:31 2004
-+++ linux/fs/binfmt_elf.c	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/fs/binfmt_elf.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/binfmt_elf.c	2007-12-15 05:19:45.006985841 +0100
++++ linux-2.4.35.4/fs/binfmt_elf.c	2007-12-15 05:19:53.171451107 +0100
 @@ -9,6 +9,7 @@
   * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com).
   */
@@ -505,13 +541,11 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int);
  extern int dump_fpu (struct pt_regs *, elf_fpregset_t *);
  extern void dump_thread(struct pt_regs *, struct user *);
-@@ -73,8 +76,14 @@
- #define ELF_PAGEOFFSET(_v) ((_v) & (ELF_MIN_ALIGN-1))
+@@ -74,7 +77,13 @@
  #define ELF_PAGEALIGN(_v) (((_v) + ELF_MIN_ALIGN - 1) & ~(ELF_MIN_ALIGN - 1))
  
--static struct linux_binfmt elf_format = {
+ static struct linux_binfmt elf_format = {
 -	NULL, THIS_MODULE, load_elf_binary, load_elf_library, elf_core_dump, ELF_EXEC_PAGESIZE
-+static struct linux_binfmt elf_format = {
 +	NULL, THIS_MODULE, load_elf_binary,
 +#ifdef CONFIG_BINFMT_ELF_AOUT
 +	load_elf_library,
@@ -521,8 +555,8 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
 +	elf_core_dump, ELF_EXEC_PAGESIZE
  };
  
- #define BAD_ADDR(x)	((unsigned long)(x) > TASK_SIZE)
-@@ -369,6 +378,7 @@
+ #define BAD_ADDR(x)	((unsigned long)(x) >= TASK_SIZE)
+@@ -404,6 +413,7 @@
  	return error;
  }
  
@@ -530,7 +564,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  static unsigned long load_aout_interp(struct exec * interp_ex,
  			     struct file * interpreter)
  {
-@@ -413,6 +423,7 @@
+@@ -451,6 +461,7 @@
  out:
  	return elf_entry;
  }
@@ -538,7 +572,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  
  /*
   * These are the functions used to load ELF style executables and shared
-@@ -420,7 +431,9 @@
+@@ -458,7 +469,9 @@
   */
  
  #define INTERPRETER_NONE 0
@@ -548,7 +582,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  #define INTERPRETER_ELF 2
  
  
-@@ -444,7 +457,9 @@
+@@ -482,7 +495,9 @@
  	struct elfhdr elf_ex;
  	struct elfhdr interp_elf_ex;
    	struct exec interp_ex;
@@ -558,7 +592,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  	struct files_struct *files;
  	
  	/* Get the exec-header */
-@@ -556,6 +571,7 @@
+@@ -612,6 +627,7 @@
  
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
@@ -566,7 +600,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  		interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT;
  
  		/* Now figure out which format our binary is */
-@@ -563,6 +579,9 @@
+@@ -619,6 +635,9 @@
  		    (N_MAGIC(interp_ex) != ZMAGIC) &&
  		    (N_MAGIC(interp_ex) != QMAGIC))
  			interpreter_type = INTERPRETER_ELF;
@@ -576,7 +610,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  
  		if (memcmp(interp_elf_ex.e_ident, ELFMAG, SELFMAG) != 0)
  			interpreter_type &= ~INTERPRETER_ELF;
-@@ -571,6 +590,7 @@
+@@ -627,6 +646,7 @@
  		if (!interpreter_type)
  			goto out_free_dentry;
  
@@ -584,7 +618,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  		/* Make sure only one type was selected */
  		if ((interpreter_type & INTERPRETER_ELF) &&
  		     interpreter_type != INTERPRETER_ELF) {
-@@ -578,6 +598,7 @@
+@@ -634,6 +654,7 @@
  			// printk(KERN_WARNING "ELF: Ambiguous type, using ELF\n");
  			interpreter_type = INTERPRETER_ELF;
  		}
@@ -592,7 +626,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  		/* Verify the interpreter has a valid arch */
  		if ((interpreter_type == INTERPRETER_ELF) &&
  		    !elf_check_arch(&interp_elf_ex))
-@@ -590,6 +611,7 @@
+@@ -651,6 +672,7 @@
  	/* OK, we are done with that, now set up the arg stuff,
  	   and then start this sucker up */
  
@@ -600,16 +634,16 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  	if (!bprm->sh_bang) {
  		char * passed_p;
  
-@@ -605,6 +627,7 @@
- 		  }
- 		}
+@@ -669,6 +691,7 @@
+ 		/* Executables without an interpreter also need a personality  */
+ 		SET_PERSONALITY(elf_ex, ibcs2_interpreter);
  	}
 +#endif
  
  	/* Flush all traces of the currently running executable */
  	retval = flush_old_exec(bprm);
-@@ -721,10 +744,12 @@
- 	end_data += load_bias;
+@@ -817,10 +840,12 @@
+ 	padzero(elf_bss);
  
  	if (elf_interpreter) {
 +#ifdef CONFIG_BINFMT_ELF_AOUT
@@ -621,7 +655,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  			elf_entry = load_elf_interp(&interp_elf_ex,
  						    interpreter,
  						    &interp_load_addr);
-@@ -743,7 +768,9 @@
+@@ -849,7 +874,9 @@
  
  	kfree(elf_phdata);
  
@@ -631,7 +665,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  		sys_close(elf_exec_fileno);
  
  	set_binfmt(&elf_format);
-@@ -757,10 +784,14 @@
+@@ -863,10 +890,14 @@
  			&elf_ex,
  			load_addr, load_bias,
  			interp_load_addr,
@@ -646,7 +680,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  	current->mm->start_brk = current->mm->brk = elf_brk;
  	current->mm->end_code = end_code;
  	current->mm->start_code = start_code;
-@@ -838,9 +869,9 @@
+@@ -937,9 +968,9 @@
  	goto out;
  }
  
@@ -657,7 +691,7 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  static int load_elf_library(struct file *file)
  {
  	struct elf_phdr *elf_phdata;
-@@ -911,6 +942,7 @@
+@@ -1016,6 +1047,7 @@
  out:
  	return error;
  }
@@ -665,9 +699,10 @@ diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c
  
  /*
   * Note that some platforms still use traditional core dumps and not
-diff -urPX nopatch linux-2.4.26/fs/exec.c linux/fs/exec.c
---- linux-2.4.26/fs/exec.c	Fri Feb 20 10:07:36 2004
-+++ linux/fs/exec.c	Sat Apr 17 02:13:55 2004
+Index: linux-2.4.35.4/fs/exec.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/exec.c	2007-12-15 05:19:41.786802333 +0100
++++ linux-2.4.35.4/fs/exec.c	2007-12-15 05:19:53.175451333 +0100
 @@ -109,6 +109,7 @@
   */
  asmlinkage long sys_uselib(const char * library)
diff --git a/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch b/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch
index fc4c29d27e..7df8263471 100644
--- a/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch
+++ b/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch
@@ -1,6 +1,8 @@
 packaging/utils/nattpatch 2.4
---- linux/include/net/sock.h	2002/02/06 15:25:10	1.1
-+++ linux/include/net/sock.h	2002/05/22 12:14:56
+Index: linux-2.4.35.4/include/net/sock.h
+===================================================================
+--- linux-2.4.35.4.orig/include/net/sock.h	2007-12-15 05:19:41.462783867 +0100
++++ linux-2.4.35.4/include/net/sock.h	2007-12-15 05:19:53.815487806 +0100
 @@ -488,7 +488,13 @@
  	} bictcp;
  };
@@ -26,17 +28,22 @@ packaging/utils/nattpatch 2.4
  
  	} tp_pinfo;
  
---- linux/net/Config.in.orig	Fri Feb  9 14:34:13 2001
-+++ linux/net/Config.in	Thu Feb 22 19:40:08 2001
-@@ -88,3 +88,5 @@
+Index: linux-2.4.35.4/net/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/Config.in	2007-12-15 05:19:41.470784323 +0100
++++ linux-2.4.35.4/net/Config.in	2007-12-15 05:19:53.819488035 +0100
+@@ -104,4 +104,6 @@
+ dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS
  endmenu
  
 +bool 'IPSEC NAT-Traversal' CONFIG_IPSEC_NAT_TRAVERSAL
 +
  endmenu
---- linux/net/ipv4/udp.c.1	Wed Jan 28 15:57:05 2004
-+++ linux/net/ipv4/udp.c	Wed Jan 28 15:58:56 2004
-@@ -787,6 +787,9 @@
+Index: linux-2.4.35.4/net/ipv4/udp.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/udp.c	2007-12-15 05:19:41.482785007 +0100
++++ linux-2.4.35.4/net/ipv4/udp.c	2007-12-15 05:19:53.823488264 +0100
+@@ -860,6 +860,9 @@
  
  static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
  {
@@ -46,7 +53,7 @@ packaging/utils/nattpatch 2.4
  	/*
  	 *	Charge it to the socket, dropping if the queue is full.
  	 */
-@@ -804,6 +807,40 @@
+@@ -877,6 +880,40 @@
  	}
  #endif
  
@@ -87,7 +94,7 @@ packaging/utils/nattpatch 2.4
  	if (sock_queue_rcv_skb(sk,skb)<0) {
  		UDP_INC_STATS_BH(UdpInErrors);
  		IP_INC_STATS_BH(IpInDiscards);
-@@ -1027,13 +1064,49 @@
+@@ -1100,13 +1137,49 @@
  	return len;
  }
  
diff --git a/target/linux/generic-2.4/patches/110-netdev_random_core.patch b/target/linux/generic-2.4/patches/110-netdev_random_core.patch
index 784b65e41c..e87e0e9d58 100644
--- a/target/linux/generic-2.4/patches/110-netdev_random_core.patch
+++ b/target/linux/generic-2.4/patches/110-netdev_random_core.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.4.26-pre5/Documentation/Configure.help linux-2.4.26-pre5-netdev-core/Documentation/Configure.help
---- linux-2.4.26-pre5/Documentation/Configure.help	Sat Mar 20 10:08:18 2004
-+++ linux-2.4.26-pre5-netdev-core/Documentation/Configure.help	Sun Mar 21 10:16:14 2004
-@@ -10419,6 +10419,20 @@
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:19:53.139449282 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:19:54.063501941 +0100
+@@ -10675,6 +10675,20 @@
  
    If you don't know what to use this for, you don't need it.
  
@@ -22,9 +23,10 @@ diff -urN linux-2.4.26-pre5/Documentation/Configure.help linux-2.4.26-pre5-netde
  Ethertap network tap (OBSOLETE)
  CONFIG_ETHERTAP
    If you say Y here (and have said Y to "Kernel/User network link
-diff -urN linux-2.4.26-pre5/drivers/net/Config.in linux-2.4.26-pre5-netdev-core/drivers/net/Config.in
---- linux-2.4.26-pre5/drivers/net/Config.in	Sat Mar 20 10:08:18 2004
-+++ linux-2.4.26-pre5-netdev-core/drivers/net/Config.in	Sun Mar 21 10:16:14 2004
+Index: linux-2.4.35.4/drivers/net/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/Config.in	2007-12-15 05:19:51.931380439 +0100
++++ linux-2.4.35.4/drivers/net/Config.in	2007-12-15 05:19:54.067502171 +0100
 @@ -8,6 +8,7 @@
  tristate 'Bonding driver support' CONFIG_BONDING
  tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
@@ -33,10 +35,11 @@ diff -urN linux-2.4.26-pre5/drivers/net/Config.in linux-2.4.26-pre5-netdev-core/
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
     tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP
  fi
-diff -urN linux-2.4.26-pre5/include/asm-alpha/signal.h linux-2.4.26-pre5-netdev-core/include/asm-alpha/signal.h
---- linux-2.4.26-pre5/include/asm-alpha/signal.h	Sat Dec  1 18:27:14 2001
-+++ linux-2.4.26-pre5-netdev-core/include/asm-alpha/signal.h	Sun Mar 21 10:16:14 2004
-@@ -121,7 +121,14 @@
+Index: linux-2.4.35.4/include/asm-alpha/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-alpha/signal.h	2007-12-15 05:19:41.318775660 +0100
++++ linux-2.4.35.4/include/asm-alpha/signal.h	2007-12-15 05:19:54.067502171 +0100
+@@ -121,8 +121,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x40000000
@@ -46,15 +49,17 @@ diff -urN linux-2.4.26-pre5/include/asm-alpha/signal.h linux-2.4.26-pre5-netdev-
 +#else
 +#define SA_NET_RANDOM	0
  #endif
-+
-+#endif /* __KERNEL__ */
  
++#endif /* __KERNEL__ */
++
  #define SIG_BLOCK          1	/* for blocking signals */
  #define SIG_UNBLOCK        2	/* for unblocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-arm/signal.h linux-2.4.26-pre5-netdev-core/include/asm-arm/signal.h
---- linux-2.4.26-pre5/include/asm-arm/signal.h	Sat Sep 13 07:57:29 2003
-+++ linux-2.4.26-pre5-netdev-core/include/asm-arm/signal.h	Sun Mar 21 10:16:14 2004
-@@ -125,7 +125,14 @@
+ #define SIG_SETMASK        3	/* for setting the signal mask */
+Index: linux-2.4.35.4/include/asm-arm/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-arm/signal.h	2007-12-15 05:19:41.326776118 +0100
++++ linux-2.4.35.4/include/asm-arm/signal.h	2007-12-15 05:19:54.067502171 +0100
+@@ -125,8 +125,15 @@
  #define SA_PROBE		0x80000000
  #define SA_SAMPLE_RANDOM	0x10000000
  #define SA_SHIRQ		0x04000000
@@ -64,15 +69,17 @@ diff -urN linux-2.4.26-pre5/include/asm-arm/signal.h linux-2.4.26-pre5-netdev-co
 +#else
 +#define SA_NET_RANDOM	0
  #endif
-+
-+#endif /* __KERNEL__ */
  
++#endif /* __KERNEL__ */
++
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-cris/signal.h linux-2.4.26-pre5-netdev-core/include/asm-cris/signal.h
---- linux-2.4.26-pre5/include/asm-cris/signal.h	Sat Dec  1 18:27:14 2001
-+++ linux-2.4.26-pre5-netdev-core/include/asm-cris/signal.h	Sun Mar 21 10:16:14 2004
-@@ -120,7 +120,14 @@
+ #define SIG_SETMASK        2	/* for setting the signal mask */
+Index: linux-2.4.35.4/include/asm-cris/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-cris/signal.h	2007-12-15 05:19:41.334776573 +0100
++++ linux-2.4.35.4/include/asm-cris/signal.h	2007-12-15 05:19:54.071502397 +0100
+@@ -120,8 +120,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -82,15 +89,17 @@ diff -urN linux-2.4.26-pre5/include/asm-cris/signal.h linux-2.4.26-pre5-netdev-c
 +#else
 +#define SA_NET_RANDOM	0
  #endif
-+
-+#endif /* __KERNEL__ */
  
++#endif /* __KERNEL__ */
++
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-i386/signal.h linux-2.4.26-pre5-netdev-core/include/asm-i386/signal.h
---- linux-2.4.26-pre5/include/asm-i386/signal.h	Sun Mar 21 00:00:43 2004
-+++ linux-2.4.26-pre5-netdev-core/include/asm-i386/signal.h	Sun Mar 21 10:16:14 2004
-@@ -119,7 +119,14 @@
+ #define SIG_SETMASK        2	/* for setting the signal mask */
+Index: linux-2.4.35.4/include/asm-i386/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-i386/signal.h	2007-12-15 05:19:41.338776800 +0100
++++ linux-2.4.35.4/include/asm-i386/signal.h	2007-12-15 05:19:54.071502397 +0100
+@@ -119,8 +119,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -100,14 +109,16 @@ diff -urN linux-2.4.26-pre5/include/asm-i386/signal.h linux-2.4.26-pre5-netdev-c
 +#else
 +#define SA_NET_RANDOM	0
  #endif
-+
-+#endif /* __KERNEL__ */
  
++#endif /* __KERNEL__ */
++
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-ia64/signal.h linux-2.4.26-pre5-netdev-core/include/asm-ia64/signal.h
---- linux-2.4.26-pre5/include/asm-ia64/signal.h	Sat Mar 20 10:08:20 2004
-+++ linux-2.4.26-pre5-netdev-core/include/asm-ia64/signal.h	Sun Mar 21 10:16:14 2004
+ #define SIG_SETMASK        2	/* for setting the signal mask */
+Index: linux-2.4.35.4/include/asm-ia64/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-ia64/signal.h	2007-12-15 05:19:41.350777484 +0100
++++ linux-2.4.35.4/include/asm-ia64/signal.h	2007-12-15 05:19:54.071502397 +0100
 @@ -117,6 +117,12 @@
  #define SA_SHIRQ		0x04000000
  #define SA_PERCPU_IRQ		0x02000000
@@ -121,10 +132,11 @@ diff -urN linux-2.4.26-pre5/include/asm-ia64/signal.h linux-2.4.26-pre5-netdev-c
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK          0	/* for blocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-m68k/signal.h linux-2.4.26-pre5-netdev-core/include/asm-m68k/signal.h
---- linux-2.4.26-pre5/include/asm-m68k/signal.h	Fri Feb 20 07:38:33 2004
-+++ linux-2.4.26-pre5-netdev-core/include/asm-m68k/signal.h	Sun Mar 21 10:16:14 2004
-@@ -116,7 +116,14 @@
+Index: linux-2.4.35.4/include/asm-m68k/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-m68k/signal.h	2007-12-15 05:19:41.358777939 +0100
++++ linux-2.4.35.4/include/asm-m68k/signal.h	2007-12-15 05:19:54.071502397 +0100
+@@ -116,8 +116,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -134,14 +146,16 @@ diff -urN linux-2.4.26-pre5/include/asm-m68k/signal.h linux-2.4.26-pre5-netdev-c
 +#else
 +#define SA_NET_RANDOM	0
  #endif
-+
-+#endif /* __KERNEL__ */
  
++#endif /* __KERNEL__ */
++
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-mips/signal.h linux-2.4.26-pre5-netdev-core/include/asm-mips/signal.h
---- linux-2.4.26-pre5/include/asm-mips/signal.h	Sat Sep 13 07:57:31 2003
-+++ linux-2.4.26-pre5-netdev-core/include/asm-mips/signal.h	Sun Mar 21 10:16:14 2004
+ #define SIG_SETMASK        2	/* for setting the signal mask */
+Index: linux-2.4.35.4/include/asm-mips/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/signal.h	2007-12-15 05:19:41.366778397 +0100
++++ linux-2.4.35.4/include/asm-mips/signal.h	2007-12-15 05:19:54.075502626 +0100
 @@ -111,6 +111,12 @@
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x02000000
@@ -155,9 +169,10 @@ diff -urN linux-2.4.26-pre5/include/asm-mips/signal.h linux-2.4.26-pre5-netdev-c
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK	1	/* for blocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-mips64/signal.h linux-2.4.26-pre5-netdev-core/include/asm-mips64/signal.h
---- linux-2.4.26-pre5/include/asm-mips64/signal.h	Sat Sep 13 07:57:32 2003
-+++ linux-2.4.26-pre5-netdev-core/include/asm-mips64/signal.h	Sun Mar 21 10:16:14 2004
+Index: linux-2.4.35.4/include/asm-mips64/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/signal.h	2007-12-15 05:19:41.374778853 +0100
++++ linux-2.4.35.4/include/asm-mips64/signal.h	2007-12-15 05:19:54.075502626 +0100
 @@ -119,6 +119,12 @@
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x02000000
@@ -171,9 +186,10 @@ diff -urN linux-2.4.26-pre5/include/asm-mips64/signal.h linux-2.4.26-pre5-netdev
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK	1	/* for blocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-parisc/signal.h linux-2.4.26-pre5-netdev-core/include/asm-parisc/signal.h
---- linux-2.4.26-pre5/include/asm-parisc/signal.h	Sun Jan 11 18:48:21 2004
-+++ linux-2.4.26-pre5-netdev-core/include/asm-parisc/signal.h	Sun Mar 21 10:16:14 2004
+Index: linux-2.4.35.4/include/asm-parisc/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-parisc/signal.h	2007-12-15 05:19:41.382779308 +0100
++++ linux-2.4.35.4/include/asm-parisc/signal.h	2007-12-15 05:19:54.075502626 +0100
 @@ -100,6 +100,12 @@
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -187,9 +203,10 @@ diff -urN linux-2.4.26-pre5/include/asm-parisc/signal.h linux-2.4.26-pre5-netdev
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK          0	/* for blocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-ppc/signal.h linux-2.4.26-pre5-netdev-core/include/asm-ppc/signal.h
---- linux-2.4.26-pre5/include/asm-ppc/signal.h	Sat Sep 13 07:57:32 2003
-+++ linux-2.4.26-pre5-netdev-core/include/asm-ppc/signal.h	Sun Mar 21 10:16:14 2004
+Index: linux-2.4.35.4/include/asm-ppc/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-ppc/signal.h	2007-12-15 05:19:41.390779764 +0100
++++ linux-2.4.35.4/include/asm-ppc/signal.h	2007-12-15 05:19:54.075502626 +0100
 @@ -111,6 +111,13 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
@@ -204,10 +221,11 @@ diff -urN linux-2.4.26-pre5/include/asm-ppc/signal.h linux-2.4.26-pre5-netdev-co
  #endif /* __KERNEL__ */
  
  #define SIG_BLOCK          0	/* for blocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-s390/signal.h linux-2.4.26-pre5-netdev-core/include/asm-s390/signal.h
---- linux-2.4.26-pre5/include/asm-s390/signal.h	Fri Feb 20 07:38:34 2004
-+++ linux-2.4.26-pre5-netdev-core/include/asm-s390/signal.h	Sun Mar 21 10:16:14 2004
-@@ -129,7 +129,14 @@
+Index: linux-2.4.35.4/include/asm-s390/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-s390/signal.h	2007-12-15 05:19:41.398780219 +0100
++++ linux-2.4.35.4/include/asm-s390/signal.h	2007-12-15 05:19:54.075502626 +0100
+@@ -129,8 +129,15 @@
  #define SA_SHIRQ                0x04000000
  #define SA_DOPATHGROUP          0x00100000
  #define SA_FORCE                0x00200000
@@ -217,15 +235,17 @@ diff -urN linux-2.4.26-pre5/include/asm-s390/signal.h linux-2.4.26-pre5-netdev-c
 +#else
 +#define SA_NET_RANDOM		0
  #endif
-+
-+#endif /* __KERNEL__ */
  
++#endif /* __KERNEL__ */
++
  #define SIG_BLOCK          0    /* for blocking signals */
  #define SIG_UNBLOCK        1    /* for unblocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-s390x/signal.h linux-2.4.26-pre5-netdev-core/include/asm-s390x/signal.h
---- linux-2.4.26-pre5/include/asm-s390x/signal.h	Fri Feb 20 07:38:34 2004
-+++ linux-2.4.26-pre5-netdev-core/include/asm-s390x/signal.h	Sun Mar 21 10:16:14 2004
-@@ -129,7 +129,14 @@
+ #define SIG_SETMASK        2    /* for setting the signal mask */
+Index: linux-2.4.35.4/include/asm-s390x/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-s390x/signal.h	2007-12-15 05:19:41.406780677 +0100
++++ linux-2.4.35.4/include/asm-s390x/signal.h	2007-12-15 05:19:54.079502852 +0100
+@@ -129,8 +129,15 @@
  #define SA_SHIRQ                0x04000000
  #define SA_DOPATHGROUP          0x00100000
  #define SA_FORCE                0x00200000
@@ -235,15 +255,17 @@ diff -urN linux-2.4.26-pre5/include/asm-s390x/signal.h linux-2.4.26-pre5-netdev-
 +#else
 +#define SA_NET_RANDOM		0
  #endif
-+
-+#endif /* __KERNEL__ */
  
++#endif /* __KERNEL__ */
++
  #define SIG_BLOCK          0    /* for blocking signals */
  #define SIG_UNBLOCK        1    /* for unblocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-sh/signal.h linux-2.4.26-pre5-netdev-core/include/asm-sh/signal.h
---- linux-2.4.26-pre5/include/asm-sh/signal.h	Sat Dec  1 18:27:13 2001
-+++ linux-2.4.26-pre5-netdev-core/include/asm-sh/signal.h	Sun Mar 21 10:16:14 2004
-@@ -107,7 +107,14 @@
+ #define SIG_SETMASK        2    /* for setting the signal mask */
+Index: linux-2.4.35.4/include/asm-sh/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-sh/signal.h	2007-12-15 05:19:41.414781133 +0100
++++ linux-2.4.35.4/include/asm-sh/signal.h	2007-12-15 05:19:54.079502852 +0100
+@@ -107,8 +107,15 @@
  #define SA_PROBE		SA_ONESHOT
  #define SA_SAMPLE_RANDOM	SA_RESTART
  #define SA_SHIRQ		0x04000000
@@ -253,15 +275,17 @@ diff -urN linux-2.4.26-pre5/include/asm-sh/signal.h linux-2.4.26-pre5-netdev-cor
 +#else
 +#define SA_NET_RANDOM	0
  #endif
-+
-+#endif /* __KERNEL__ */
  
++#endif /* __KERNEL__ */
++
  #define SIG_BLOCK          0	/* for blocking signals */
  #define SIG_UNBLOCK        1	/* for unblocking signals */
-diff -urN linux-2.4.26-pre5/include/asm-sparc/signal.h linux-2.4.26-pre5-netdev-core/include/asm-sparc/signal.h
---- linux-2.4.26-pre5/include/asm-sparc/signal.h	Sat Dec  1 18:27:14 2001
-+++ linux-2.4.26-pre5-netdev-core/include/asm-sparc/signal.h	Sun Mar 21 10:16:14 2004
-@@ -176,7 +176,14 @@
+ #define SIG_SETMASK        2	/* for setting the signal mask */
+Index: linux-2.4.35.4/include/asm-sparc/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-sparc/signal.h	2007-12-15 05:19:41.422781588 +0100
++++ linux-2.4.35.4/include/asm-sparc/signal.h	2007-12-15 05:19:54.079502852 +0100
+@@ -176,8 +176,15 @@
  #define SA_PROBE SA_ONESHOT
  #define SA_SAMPLE_RANDOM SA_RESTART
  #define SA_STATIC_ALLOC		0x80
@@ -271,15 +295,17 @@ diff -urN linux-2.4.26-pre5/include/asm-sparc/signal.h linux-2.4.26-pre5-netdev-
 +#else
 +#define SA_NET_RANDOM	0
  #endif
-+
-+#endif /* __KERNEL__ */
  
++#endif /* __KERNEL__ */
++
  /* Type of a signal handler.  */
  #ifdef __KERNEL__
-diff -urN linux-2.4.26-pre5/include/asm-sparc64/signal.h linux-2.4.26-pre5-netdev-core/include/asm-sparc64/signal.h
---- linux-2.4.26-pre5/include/asm-sparc64/signal.h	Sat Dec  1 18:27:14 2001
-+++ linux-2.4.26-pre5-netdev-core/include/asm-sparc64/signal.h	Sun Mar 21 10:16:14 2004
-@@ -192,7 +192,14 @@
+ typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *);
+Index: linux-2.4.35.4/include/asm-sparc64/signal.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-sparc64/signal.h	2007-12-15 05:19:41.430782043 +0100
++++ linux-2.4.35.4/include/asm-sparc64/signal.h	2007-12-15 05:19:54.079502852 +0100
+@@ -192,8 +192,15 @@
  #define SA_PROBE SA_ONESHOT
  #define SA_SAMPLE_RANDOM SA_RESTART
  #define SA_STATIC_ALLOC		0x80
@@ -289,8 +315,9 @@ diff -urN linux-2.4.26-pre5/include/asm-sparc64/signal.h linux-2.4.26-pre5-netde
 +#else
 +#define SA_NET_RANDOM	0
  #endif
-+
-+#endif /* __KERNEL__ */
  
++#endif /* __KERNEL__ */
++
  /* Type of a signal handler.  */
  #ifdef __KERNEL__
+ typedef void (*__sighandler_t)(int, struct sigcontext *);
diff --git a/target/linux/generic-2.4/patches/112-bridging_performance.patch b/target/linux/generic-2.4/patches/112-bridging_performance.patch
index c5d86349d4..953154959b 100644
--- a/target/linux/generic-2.4/patches/112-bridging_performance.patch
+++ b/target/linux/generic-2.4/patches/112-bridging_performance.patch
@@ -1,5 +1,7 @@
---- linux.old/net/core/dev.c	2005-07-05 16:42:36.000000000 +0200
-+++ linux.dev/net/core/dev.c	2005-07-08 19:32:46.000000000 +0200
+Index: linux-2.4.35.4/net/core/dev.c
+===================================================================
+--- linux-2.4.35.4.orig/net/core/dev.c	2007-12-15 05:19:51.651364482 +0100
++++ linux-2.4.35.4/net/core/dev.c	2007-12-15 05:19:54.483525877 +0100
 @@ -1289,6 +1289,19 @@
  	local_irq_save(flags);
  
diff --git a/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch b/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch
index 1b98717882..853b776f1e 100644
--- a/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch
+++ b/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch
@@ -1,6 +1,7 @@
-diff -Nur linux.old/arch/mips/kernel/mips_ksyms.c linux.dev/arch/mips/kernel/mips_ksyms.c
---- linux.old/arch/mips/kernel/mips_ksyms.c	2004-02-18 14:36:30.000000000 +0100
-+++ linux.dev/arch/mips/kernel/mips_ksyms.c	2005-10-24 14:21:53.702396250 +0200
+Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c	2007-12-15 05:19:41.186768139 +0100
++++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c	2007-12-15 05:19:54.695537960 +0100
 @@ -30,6 +30,10 @@
  #include <asm/floppy.h>
  #endif
@@ -26,9 +27,10 @@ diff -Nur linux.old/arch/mips/kernel/mips_ksyms.c linux.dev/arch/mips/kernel/mip
  /* Networking helper routines. */
  EXPORT_SYMBOL(csum_partial_copy);
  
-diff -Nur linux.old/arch/mips/lib/Makefile linux.dev/arch/mips/lib/Makefile
---- linux.old/arch/mips/lib/Makefile	2004-02-18 14:36:30.000000000 +0100
-+++ linux.dev/arch/mips/lib/Makefile	2005-10-24 14:21:53.774400750 +0200
+Index: linux-2.4.35.4/arch/mips/lib/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/lib/Makefile	2007-12-15 05:19:41.194768595 +0100
++++ linux-2.4.35.4/arch/mips/lib/Makefile	2007-12-15 05:19:54.699538186 +0100
 @@ -9,7 +9,8 @@
  obj-y				+= csum_partial.o csum_partial_copy.o \
  				   promlib.o rtc-std.o rtc-no.o memcpy.o \
@@ -39,9 +41,10 @@ diff -Nur linux.old/arch/mips/lib/Makefile linux.dev/arch/mips/lib/Makefile
  
  export-objs			:= rtc-std.o rtc-no.o
  
-diff -Nur linux.old/arch/mips/lib/ashldi3.c linux.dev/arch/mips/lib/ashldi3.c
---- linux.old/arch/mips/lib/ashldi3.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/lib/ashldi3.c	2005-10-24 14:21:53.774400750 +0200
+Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/lib/ashldi3.c	2007-12-15 05:19:54.707538644 +0100
 @@ -0,0 +1,62 @@
 +/* ashrdi3.c extracted from gcc-2.95.2/libgcc2.c which is: */
 +/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
@@ -105,9 +108,10 @@ diff -Nur linux.old/arch/mips/lib/ashldi3.c linux.dev/arch/mips/lib/ashldi3.c
 +
 +  return w.ll;
 +}
-diff -Nur linux.old/arch/mips/lib/ashrdi3.c linux.dev/arch/mips/lib/ashrdi3.c
---- linux.old/arch/mips/lib/ashrdi3.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/lib/ashrdi3.c	2005-10-24 14:21:53.774400750 +0200
+Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/lib/ashrdi3.c	2007-12-15 05:19:54.711538870 +0100
 @@ -0,0 +1,63 @@
 +/* ashrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
 +/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
@@ -172,9 +176,10 @@ diff -Nur linux.old/arch/mips/lib/ashrdi3.c linux.dev/arch/mips/lib/ashrdi3.c
 +
 +  return w.ll;
 +}
-diff -Nur linux.old/arch/mips/lib/lshrdi3.c linux.dev/arch/mips/lib/lshrdi3.c
---- linux.old/arch/mips/lib/lshrdi3.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/lib/lshrdi3.c	2005-10-24 14:21:53.774400750 +0200
+Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/lib/lshrdi3.c	2007-12-15 05:19:54.715539100 +0100
 @@ -0,0 +1,62 @@
 +/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
 +/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
@@ -238,9 +243,10 @@ diff -Nur linux.old/arch/mips/lib/lshrdi3.c linux.dev/arch/mips/lib/lshrdi3.c
 +
 +  return w.ll;
 +}
-diff -Nur linux.old/arch/mips/lib/muldi3.c linux.dev/arch/mips/lib/muldi3.c
---- linux.old/arch/mips/lib/muldi3.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/lib/muldi3.c	2005-10-24 14:21:53.774400750 +0200
+Index: linux-2.4.35.4/arch/mips/lib/muldi3.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/arch/mips/lib/muldi3.c	2007-12-15 05:19:54.715539100 +0100
 @@ -0,0 +1,63 @@
 +/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and 
 +			   gcc-2.7.2.3/longlong.h which is: */
@@ -305,9 +311,10 @@ diff -Nur linux.old/arch/mips/lib/muldi3.c linux.dev/arch/mips/lib/muldi3.c
 +
 +  return w.ll;
 +}
-diff -Nur linux.old/fs/cifs/cifsfs.c linux.dev/fs/cifs/cifsfs.c
---- linux.old/fs/cifs/cifsfs.c	2005-10-24 13:48:27.599659000 +0200
-+++ linux.dev/fs/cifs/cifsfs.c	2005-10-24 14:25:06.526447000 +0200
+Index: linux-2.4.35.4/fs/cifs/cifsfs.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/cifs/cifsfs.c	2007-12-15 05:19:52.279400271 +0100
++++ linux-2.4.35.4/fs/cifs/cifsfs.c	2007-12-15 05:19:54.715539100 +0100
 @@ -50,8 +50,6 @@
  static struct quotactl_ops cifs_quotactl_ops;
  #endif
@@ -317,9 +324,10 @@ diff -Nur linux.old/fs/cifs/cifsfs.c linux.dev/fs/cifs/cifsfs.c
  int cifsFYI = 0;
  int cifsERROR = 1;
  int traceSMB = 0;
-diff -Nur linux.old/include/asm-mips/uaccess.h linux.dev/include/asm-mips/uaccess.h
---- linux.old/include/asm-mips/uaccess.h	2005-01-19 15:10:12.000000000 +0100
-+++ linux.dev/include/asm-mips/uaccess.h	2005-10-24 14:11:48.563214250 +0200
+Index: linux-2.4.35.4/include/asm-mips/uaccess.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/uaccess.h	2007-12-15 05:19:41.238771101 +0100
++++ linux-2.4.35.4/include/asm-mips/uaccess.h	2007-12-15 05:19:54.715539100 +0100
 @@ -149,7 +149,7 @@
   * Returns zero on success, or -EFAULT on error.
   */
diff --git a/target/linux/generic-2.4/patches/114-sched_use_tsc.patch b/target/linux/generic-2.4/patches/114-sched_use_tsc.patch
index 5b64310738..30f984476c 100644
--- a/target/linux/generic-2.4/patches/114-sched_use_tsc.patch
+++ b/target/linux/generic-2.4/patches/114-sched_use_tsc.patch
@@ -1,6 +1,7 @@
-diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
---- linux.old/arch/mips/kernel/time.c	2005-11-14 11:06:38.661262000 +0100
-+++ linux.dev/arch/mips/kernel/time.c	2005-11-15 20:02:50.059676750 +0100
+Index: linux-2.4.35.4/arch/mips/kernel/time.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/time.c	2007-12-15 05:19:41.138765402 +0100
++++ linux-2.4.35.4/arch/mips/kernel/time.c	2007-12-15 05:19:55.011555967 +0100
 @@ -151,6 +151,27 @@
  unsigned int (*mips_hpt_read)(void);
  void (*mips_hpt_init)(unsigned int);
@@ -35,9 +36,10 @@ diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
  EXPORT_SYMBOL(rtc_get_time);
 +EXPORT_SYMBOL(get_htscl);
 +EXPORT_SYMBOL(get_tscll);
-diff -urN linux.old/include/asm-mips/timex.h linux.dev/include/asm-mips/timex.h
---- linux.old/include/asm-mips/timex.h	2005-11-14 11:06:38.685263500 +0100
-+++ linux.dev/include/asm-mips/timex.h	2005-11-14 11:02:21.069163500 +0100
+Index: linux-2.4.35.4/include/asm-mips/timex.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/timex.h	2007-12-15 05:19:41.146765860 +0100
++++ linux-2.4.35.4/include/asm-mips/timex.h	2007-12-15 05:19:55.015556197 +0100
 @@ -31,6 +31,19 @@
  	return read_c0_count();
  }
@@ -58,9 +60,10 @@ diff -urN linux.old/include/asm-mips/timex.h linux.dev/include/asm-mips/timex.h
  #define vxtime_lock()		do {} while (0)
  #define vxtime_unlock()		do {} while (0)
  
-diff -urN linux.old/include/net/pkt_sched.h linux.dev/include/net/pkt_sched.h
---- linux.old/include/net/pkt_sched.h	2005-11-14 11:06:38.709265000 +0100
-+++ linux.dev/include/net/pkt_sched.h	2005-11-14 11:02:21.069163500 +0100
+Index: linux-2.4.35.4/include/net/pkt_sched.h
+===================================================================
+--- linux-2.4.35.4.orig/include/net/pkt_sched.h	2007-12-15 05:19:41.154766315 +0100
++++ linux-2.4.35.4/include/net/pkt_sched.h	2007-12-15 05:19:55.023556652 +0100
 @@ -5,7 +5,11 @@
  #define PSCHED_JIFFIES 		2
  #define PSCHED_CPU 		3
@@ -73,7 +76,7 @@ diff -urN linux.old/include/net/pkt_sched.h linux.dev/include/net/pkt_sched.h
  
  #include <linux/config.h>
  #include <linux/types.h>
-@@ -271,7 +275,7 @@
+@@ -261,7 +265,7 @@
  #define PSCHED_US2JIFFIE(delay) (((delay)+psched_clock_per_hz-1)/psched_clock_per_hz)
  #define PSCHED_JIFFIE2US(delay) ((delay)*psched_clock_per_hz)
  
diff --git a/target/linux/generic-2.4/patches/115-branch_emul_fix.patch b/target/linux/generic-2.4/patches/115-branch_emul_fix.patch
index a873a3882b..4bb25a1046 100644
--- a/target/linux/generic-2.4/patches/115-branch_emul_fix.patch
+++ b/target/linux/generic-2.4/patches/115-branch_emul_fix.patch
@@ -1,5 +1,7 @@
---- linux.old/arch/mips/kernel/branch.c	2006-12-23 21:34:20.000000000 +0100
-+++ linux.dev/arch/mips/kernel/branch.c	2007-01-24 18:05:34.000000000 +0100
+Index: linux-2.4.35.4/arch/mips/kernel/branch.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/branch.c	2007-12-15 05:19:41.102763351 +0100
++++ linux-2.4.35.4/arch/mips/kernel/branch.c	2007-12-15 05:19:55.259570100 +0100
 @@ -170,7 +170,7 @@
  		bit = (insn.i_format.rt >> 2);
  		bit += (bit != 0);
diff --git a/target/linux/generic-2.4/patches/200-i4l.patch b/target/linux/generic-2.4/patches/200-i4l.patch
index c9833e2a30..353e304df7 100644
--- a/target/linux/generic-2.4/patches/200-i4l.patch
+++ b/target/linux/generic-2.4/patches/200-i4l.patch
@@ -1,6 +1,7 @@
-diff -rNu linux-2.4.29.old/Documentation/isdn/CREDITS linux-2.4.29/Documentation/isdn/CREDITS
---- linux-2.4.29.old/Documentation/isdn/CREDITS	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/CREDITS	2005-03-22 15:06:50.246454160 +0100
+Index: linux-2.4.35.4/Documentation/isdn/CREDITS
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/CREDITS	2007-12-15 05:19:39.346663275 +0100
++++ linux-2.4.35.4/Documentation/isdn/CREDITS	2007-12-15 05:19:55.467581957 +0100
 @@ -37,7 +37,7 @@
  Andreas Kool (akool@Kool.f.EUnet.de)
    For contribution of the isdnlog/isdnrep-tool
@@ -10,9 +11,10 @@ diff -rNu linux-2.4.29.old/Documentation/isdn/CREDITS linux-2.4.29/Documentation
    For lot of new ideas and the pcbit driver.
  
  Eberhard Moenkeberg (emoenke@gwdg.de)
-diff -rNu linux-2.4.29.old/Documentation/isdn/HiSax.cert linux-2.4.29/Documentation/isdn/HiSax.cert
---- linux-2.4.29.old/Documentation/isdn/HiSax.cert	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/HiSax.cert	2005-03-22 15:06:50.264451424 +0100
+Index: linux-2.4.35.4/Documentation/isdn/HiSax.cert
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/HiSax.cert	2007-12-15 05:19:39.354663733 +0100
++++ linux-2.4.35.4/Documentation/isdn/HiSax.cert	2007-12-15 05:19:55.471582183 +0100
 @@ -68,6 +68,8 @@
  drivers/isdn/hisax/elsa.c
  drivers/isdn/hisax/diva.c
@@ -22,9 +24,10 @@ diff -rNu linux-2.4.29.old/Documentation/isdn/HiSax.cert linux-2.4.29/Documentat
  
  Please send any changes, bugfixes and patches to me rather than implementing
  them directly into the HiSax sources.
-diff -rNu linux-2.4.29.old/Documentation/isdn/INTERFACE linux-2.4.29/Documentation/isdn/INTERFACE
---- linux-2.4.29.old/Documentation/isdn/INTERFACE	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/INTERFACE	2005-03-22 15:06:50.288447776 +0100
+Index: linux-2.4.35.4/Documentation/isdn/INTERFACE
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/INTERFACE	2007-12-15 05:19:39.362664189 +0100
++++ linux-2.4.35.4/Documentation/isdn/INTERFACE	2007-12-15 05:19:55.479582638 +0100
 @@ -1,4 +1,4 @@
 -$Id: INTERFACE,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
 +$Id: INTERFACE,v 1.17 2002/01/31 13:26:35 keil Exp $
@@ -63,18 +66,20 @@ diff -rNu linux-2.4.29.old/Documentation/isdn/INTERFACE linux-2.4.29/Documentati
 +      command     = ISDN_STAT_PROCEED
 +      arg         = channel-number, locally to the driver. (starting with 0)
 +
-diff -rNu linux-2.4.29.old/Documentation/isdn/INTERFACE.fax linux-2.4.29/Documentation/isdn/INTERFACE.fax
---- linux-2.4.29.old/Documentation/isdn/INTERFACE.fax	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/INTERFACE.fax	2005-03-22 15:06:50.312444128 +0100
+Index: linux-2.4.35.4/Documentation/isdn/INTERFACE.fax
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/INTERFACE.fax	2007-12-15 05:19:39.366664415 +0100
++++ linux-2.4.35.4/Documentation/isdn/INTERFACE.fax	2007-12-15 05:19:55.483582867 +0100
 @@ -1,4 +1,4 @@
 -$Id: INTERFACE.fax,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
 +$Id: INTERFACE.fax,v 1.2 2000/08/06 09:22:50 armin Exp $
  
  
  Description of the fax-subinterface between linklevel and hardwarelevel of 
-diff -rNu linux-2.4.29.old/Documentation/isdn/README linux-2.4.29/Documentation/isdn/README
---- linux-2.4.29.old/Documentation/isdn/README	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/README	2005-03-22 15:06:50.340439872 +0100
+Index: linux-2.4.35.4/Documentation/isdn/README
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/README	2007-12-15 05:19:39.374664873 +0100
++++ linux-2.4.35.4/Documentation/isdn/README	2007-12-15 05:19:55.487583097 +0100
 @@ -278,6 +278,12 @@
                                        1 = Add CPN to FCON message on
                              Bit 2:    0 = Add CDN to RING/FCON message off
@@ -88,9 +93,10 @@ diff -rNu linux-2.4.29.old/Documentation/isdn/README linux-2.4.29/Documentation/
  
    Last but not least a (at the moment fairly primitive) device to request
    the line-status (/dev/isdninfo) is made available.
-diff -rNu linux-2.4.29.old/Documentation/isdn/README.HiSax linux-2.4.29/Documentation/isdn/README.HiSax
---- linux-2.4.29.old/Documentation/isdn/README.HiSax	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/README.HiSax	2005-03-22 15:06:50.372435008 +0100
+Index: linux-2.4.35.4/Documentation/isdn/README.HiSax
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/README.HiSax	2007-12-15 05:19:39.382665329 +0100
++++ linux-2.4.35.4/Documentation/isdn/README.HiSax	2007-12-15 05:19:55.487583097 +0100
 @@ -41,10 +41,9 @@
  ELSA Quickstep 3000PCI
  ELSA PCMCIA
@@ -182,63 +188,70 @@ diff -rNu linux-2.4.29.old/Documentation/isdn/README.HiSax linux-2.4.29/Document
  
  Running the driver
  ------------------
-diff -rNu linux-2.4.29.old/Documentation/isdn/README.act2000 linux-2.4.29/Documentation/isdn/README.act2000
---- linux-2.4.29.old/Documentation/isdn/README.act2000	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/README.act2000	2005-03-22 15:06:50.388432576 +0100
+Index: linux-2.4.35.4/Documentation/isdn/README.act2000
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/README.act2000	2007-12-15 05:19:39.390665784 +0100
++++ linux-2.4.35.4/Documentation/isdn/README.act2000	2007-12-15 05:19:55.487583097 +0100
 @@ -1,4 +1,4 @@
 -$Id: README.act2000,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
 +$Id: README.act2000,v 1.3 2000/08/06 09:22:51 armin Exp $
  
  This document describes the ACT2000 driver for the
  IBM Active 2000 ISDN card.
-diff -rNu linux-2.4.29.old/Documentation/isdn/README.audio linux-2.4.29/Documentation/isdn/README.audio
---- linux-2.4.29.old/Documentation/isdn/README.audio	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/README.audio	2005-03-22 15:06:50.404430144 +0100
+Index: linux-2.4.35.4/Documentation/isdn/README.audio
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/README.audio	2007-12-15 05:19:39.394666013 +0100
++++ linux-2.4.35.4/Documentation/isdn/README.audio	2007-12-15 05:19:55.487583097 +0100
 @@ -1,4 +1,4 @@
 -$Id: README.audio,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
 +$Id: README.audio,v 1.8 1999/07/11 17:17:29 armin Exp $
  
  ISDN subsystem for Linux.
    Description of audio mode.
-diff -rNu linux-2.4.29.old/Documentation/isdn/README.eicon linux-2.4.29/Documentation/isdn/README.eicon
---- linux-2.4.29.old/Documentation/isdn/README.eicon	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/README.eicon	2005-03-22 15:06:50.479418744 +0100
+Index: linux-2.4.35.4/Documentation/isdn/README.eicon
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/README.eicon	2007-12-15 05:19:39.402666468 +0100
++++ linux-2.4.35.4/Documentation/isdn/README.eicon	2007-12-15 05:19:55.487583097 +0100
 @@ -1,4 +1,4 @@
 -$Id: README.eicon,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
 +$Id: README.eicon,v 1.10 2000/08/13 12:19:15 armin Exp $
  
  (c) 1999,2000 Armin Schindler (mac@melware.de)
  (c) 1999,2000 Cytronics & Melware (info@melware.de)
-diff -rNu linux-2.4.29.old/Documentation/isdn/README.hysdn linux-2.4.29/Documentation/isdn/README.hysdn
---- linux-2.4.29.old/Documentation/isdn/README.hysdn	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/README.hysdn	2005-03-22 15:06:50.522412208 +0100
+Index: linux-2.4.35.4/Documentation/isdn/README.hysdn
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/README.hysdn	2007-12-15 05:19:39.410666924 +0100
++++ linux-2.4.35.4/Documentation/isdn/README.hysdn	2007-12-15 05:19:55.491583323 +0100
 @@ -1,4 +1,4 @@
 -$Id: README.hysdn,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
 +$Id: README.hysdn,v 1.3.6.1 2001/02/10 14:41:19 kai Exp $
  The hysdn driver has been written by
  by Werner Cornelius (werner@isdn4linux.de or werner@titro.de) 
  for Hypercope GmbH Aachen Germany. Hypercope agreed to publish this driver
-diff -rNu linux-2.4.29.old/Documentation/isdn/README.icn linux-2.4.29/Documentation/isdn/README.icn
---- linux-2.4.29.old/Documentation/isdn/README.icn	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/README.icn	2005-03-22 15:06:50.550407952 +0100
+Index: linux-2.4.35.4/Documentation/isdn/README.icn
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/README.icn	2007-12-15 05:19:39.418667379 +0100
++++ linux-2.4.35.4/Documentation/isdn/README.icn	2007-12-15 05:19:55.491583323 +0100
 @@ -1,4 +1,4 @@
 -$Id: README.icn,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
 +$Id: README.icn,v 1.7 2000/08/06 09:22:51 armin Exp $
  
  You can get the ICN-ISDN-card from:
  
-diff -rNu linux-2.4.29.old/Documentation/isdn/README.pcbit linux-2.4.29/Documentation/isdn/README.pcbit
---- linux-2.4.29.old/Documentation/isdn/README.pcbit	2005-03-22 14:48:26.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/README.pcbit	2005-03-22 15:06:50.567405368 +0100
+Index: linux-2.4.35.4/Documentation/isdn/README.pcbit
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/isdn/README.pcbit	2007-12-15 05:19:39.422667608 +0100
++++ linux-2.4.35.4/Documentation/isdn/README.pcbit	2007-12-15 05:19:55.491583323 +0100
 @@ -37,4 +37,4 @@
  regards,
    Pedro.
  		
 -<pedro_m@yahoo.com>
 +<roque@di.fc.ul.pt>
-diff -rNu linux-2.4.29.old/Documentation/isdn/abcext_kernel.help linux-2.4.29/Documentation/isdn/abcext_kernel.help
---- linux-2.4.29.old/Documentation/isdn/abcext_kernel.help	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/Documentation/isdn/abcext_kernel.help	2005-03-22 15:06:50.600400352 +0100
+Index: linux-2.4.35.4/Documentation/isdn/abcext_kernel.help
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/Documentation/isdn/abcext_kernel.help	2007-12-15 05:19:55.491583323 +0100
 @@ -0,0 +1,166 @@
 + 
 +ISDN-ABC-DW Extension
@@ -406,9 +419,10 @@ diff -rNu linux-2.4.29.old/Documentation/isdn/abcext_kernel.help linux-2.4.29/Do
 +   See "linux/Documentation/isdn/dw-abc-extension-howto.txt" 
 +   for more Information
 +
-diff -rNu linux-2.4.29.old/drivers/isdn/Config.in linux-2.4.29/drivers/isdn/Config.in
---- linux-2.4.29.old/drivers/isdn/Config.in	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/Config.in	2005-03-22 15:06:44.259364336 +0100
+Index: linux-2.4.35.4/drivers/isdn/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/Config.in	2007-12-15 05:19:39.438668519 +0100
++++ linux-2.4.35.4/drivers/isdn/Config.in	2007-12-15 05:19:55.491583323 +0100
 @@ -4,11 +4,9 @@
  
  # only included if CONFIG_ISDN != n
@@ -538,9 +552,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/Config.in linux-2.4.29/drivers/isdn/Conf
  fi
  endmenu
  
-diff -rNu linux-2.4.29.old/drivers/isdn/Makefile linux-2.4.29/drivers/isdn/Makefile
---- linux-2.4.29.old/drivers/isdn/Makefile	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/Makefile	2005-03-22 15:06:44.277361600 +0100
+Index: linux-2.4.35.4/drivers/isdn/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/Makefile	2007-12-15 05:19:39.446668974 +0100
++++ linux-2.4.35.4/drivers/isdn/Makefile	2007-12-15 05:19:55.495583552 +0100
 @@ -2,7 +2,7 @@
  
  # The target object and module list name.
@@ -562,9 +577,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/Makefile linux-2.4.29/drivers/isdn/Makef
  subdir-$(CONFIG_ISDN_DRV_ICN)		+= icn
  subdir-$(CONFIG_ISDN_DRV_PCBIT)		+= pcbit
  subdir-$(CONFIG_ISDN_DRV_SC)		+= sc
-diff -rNu linux-2.4.29.old/drivers/isdn/act2000/act2000.h linux-2.4.29/drivers/isdn/act2000/act2000.h
---- linux-2.4.29.old/drivers/isdn/act2000/act2000.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/act2000/act2000.h	2005-03-22 15:06:44.103388048 +0100
+Index: linux-2.4.35.4/drivers/isdn/act2000/act2000.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000.h	2007-12-15 05:19:39.450669203 +0100
++++ linux-2.4.35.4/drivers/isdn/act2000/act2000.h	2007-12-15 05:19:55.495583552 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: act2000.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id$
@@ -594,9 +610,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/act2000/act2000.h linux-2.4.29/drivers/i
  {
          queue_task(&card->poll_tq, &tq_immediate);
          mark_bh(IMMEDIATE_BH);
-diff -rNu linux-2.4.29.old/drivers/isdn/act2000/act2000_isa.c linux-2.4.29/drivers/isdn/act2000/act2000_isa.c
---- linux-2.4.29.old/drivers/isdn/act2000/act2000_isa.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/act2000/act2000_isa.c	2005-03-22 15:06:44.135383184 +0100
+Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000_isa.c	2007-12-15 05:19:39.458669659 +0100
++++ linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c	2007-12-15 05:19:55.495583552 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: act2000_isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id$
@@ -633,18 +650,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/act2000/act2000_isa.c linux-2.4.29/drive
  	}
  }
  
-diff -rNu linux-2.4.29.old/drivers/isdn/act2000/act2000_isa.h linux-2.4.29/drivers/isdn/act2000/act2000_isa.h
---- linux-2.4.29.old/drivers/isdn/act2000/act2000_isa.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/act2000/act2000_isa.h	2005-03-22 15:06:44.152380600 +0100
+Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000_isa.h	2007-12-15 05:19:39.466670114 +0100
++++ linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.h	2007-12-15 05:19:55.495583552 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: act2000_isa.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id$
   *
   * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000 (ISA-Version).
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/act2000/capi.c linux-2.4.29/drivers/isdn/act2000/capi.c
---- linux-2.4.29.old/drivers/isdn/act2000/capi.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/act2000/capi.c	2005-03-22 15:06:44.172377560 +0100
+Index: linux-2.4.35.4/drivers/isdn/act2000/capi.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/act2000/capi.c	2007-12-15 05:19:39.474670572 +0100
++++ linux-2.4.35.4/drivers/isdn/act2000/capi.c	2007-12-15 05:19:55.495583552 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capi.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id$
@@ -662,9 +681,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/act2000/capi.c linux-2.4.29/drivers/isdn
  #endif
  	{{ 0x00, 0x00}, NULL},
  };
-diff -rNu linux-2.4.29.old/drivers/isdn/act2000/capi.h linux-2.4.29/drivers/isdn/act2000/capi.h
---- linux-2.4.29.old/drivers/isdn/act2000/capi.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/act2000/capi.h	2005-03-22 15:06:44.187375280 +0100
+Index: linux-2.4.35.4/drivers/isdn/act2000/capi.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/act2000/capi.h	2007-12-15 05:19:39.478670799 +0100
++++ linux-2.4.35.4/drivers/isdn/act2000/capi.h	2007-12-15 05:19:55.499583778 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capi.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id$
@@ -708,9 +728,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/act2000/capi.h linux-2.4.29/drivers/isdn
  actcapi_nextsmsg(act2000_card *card)
  {
  	unsigned long flags;
-diff -rNu linux-2.4.29.old/drivers/isdn/act2000/module.c linux-2.4.29/drivers/isdn/act2000/module.c
---- linux-2.4.29.old/drivers/isdn/act2000/module.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/act2000/module.c	2005-03-22 15:06:44.202373000 +0100
+Index: linux-2.4.35.4/drivers/isdn/act2000/module.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/act2000/module.c	2007-12-15 05:19:39.486671254 +0100
++++ linux-2.4.35.4/drivers/isdn/act2000/module.c	2007-12-15 05:19:55.499583778 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: module.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id$
@@ -768,27 +789,30 @@ diff -rNu linux-2.4.29.old/drivers/isdn/act2000/module.c linux-2.4.29/drivers/is
  
  module_init(act2000_init);
  module_exit(act2000_exit);
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/avm_cs.c linux-2.4.29/drivers/isdn/avmb1/avm_cs.c
---- linux-2.4.29.old/drivers/isdn/avmb1/avm_cs.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/avm_cs.c	2005-03-22 15:06:44.696297912 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/avm_cs.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/avm_cs.c	2007-12-15 05:19:39.494671712 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/avm_cs.c	2007-12-15 05:19:55.499583778 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: avm_cs.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: avm_cs.c,v 1.6 2001/09/24 13:22:44 kai Exp $
   *
   * A PCMCIA client driver for AVM B1/M1/M2
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/avmcard.h linux-2.4.29/drivers/isdn/avmb1/avmcard.h
---- linux-2.4.29.old/drivers/isdn/avmb1/avmcard.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/avmcard.h	2005-03-22 15:06:44.711295632 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/avmcard.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/avmcard.h	2007-12-15 05:19:39.502672167 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/avmcard.h	2007-12-15 05:19:55.499583778 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: avmcard.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: avmcard.h,v 1.12 2001/09/24 13:22:44 kai Exp $
   *
   * Copyright 1999 by Carsten Paeth <calle@calle.de>
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1.c linux-2.4.29/drivers/isdn/avmb1/b1.c
---- linux-2.4.29.old/drivers/isdn/avmb1/b1.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/b1.c	2005-03-22 15:06:44.733292288 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/b1.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1.c	2007-12-15 05:19:39.510672623 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/b1.c	2007-12-15 05:19:55.503584007 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: b1.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: b1.c,v 1.26 2001/09/24 13:22:44 kai Exp $
@@ -812,9 +836,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1.c linux-2.4.29/drivers/isdn/avm
  
  /* ------------------------------------------------------------- */
  
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1dma.c linux-2.4.29/drivers/isdn/avmb1/b1dma.c
---- linux-2.4.29.old/drivers/isdn/avmb1/b1dma.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/b1dma.c	2005-03-22 15:06:44.750289704 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1dma.c	2007-12-15 05:19:39.514672852 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c	2007-12-15 05:19:55.503584007 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: b1dma.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: b1dma.c,v 1.18 2001/09/24 13:22:44 kai Exp $
@@ -868,9 +893,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1dma.c linux-2.4.29/drivers/isdn/
  	rxlen  = b1dmainmeml(card->mbase+0x28);
  
  	csr  = b1dmainmeml(card->mbase+AMCC_INTCSR);
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1isa.c linux-2.4.29/drivers/isdn/avmb1/b1isa.c
---- linux-2.4.29.old/drivers/isdn/avmb1/b1isa.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/b1isa.c	2005-03-22 15:06:44.766287272 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/b1isa.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1isa.c	2007-12-15 05:19:39.522673307 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/b1isa.c	2007-12-15 05:19:55.503584007 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: b1isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: b1isa.c,v 1.14 2001/09/24 13:22:44 kai Exp $
@@ -892,9 +918,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1isa.c linux-2.4.29/drivers/isdn/
  
  /* ------------------------------------------------------------- */
  
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1pci.c linux-2.4.29/drivers/isdn/avmb1/b1pci.c
---- linux-2.4.29.old/drivers/isdn/avmb1/b1pci.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/b1pci.c	2005-03-22 15:06:44.781284992 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1pci.c	2007-12-15 05:19:39.530673763 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c	2007-12-15 05:19:55.503584007 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: b1pci.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: b1pci.c,v 1.40 2001/09/24 13:22:44 kai Exp $
@@ -954,9 +981,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1pci.c linux-2.4.29/drivers/isdn/
  
  		printk(KERN_INFO
  		"%s: PCI BIOS reports AVM-B1 at i/o %#x, irq %d\n",
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1pcmcia.c linux-2.4.29/drivers/isdn/avmb1/b1pcmcia.c
---- linux-2.4.29.old/drivers/isdn/avmb1/b1pcmcia.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/b1pcmcia.c	2005-03-22 15:06:44.796282712 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pcmcia.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1pcmcia.c	2007-12-15 05:19:39.538674218 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/b1pcmcia.c	2007-12-15 05:19:55.503584007 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: b1pcmcia.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: b1pcmcia.c,v 1.17 2001/09/24 13:22:44 kai Exp $
@@ -972,9 +1000,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1pcmcia.c linux-2.4.29/drivers/is
  
  /* ------------------------------------------------------------- */
  
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/c4.c linux-2.4.29/drivers/isdn/avmb1/c4.c
---- linux-2.4.29.old/drivers/isdn/avmb1/c4.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/c4.c	2005-03-22 15:06:44.812280280 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/c4.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/c4.c	2007-12-15 05:19:39.542674447 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/c4.c	2007-12-15 05:19:55.507584236 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: c4.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: c4.c,v 1.38 2001/09/24 13:22:44 kai Exp $
@@ -989,7 +1018,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/c4.c linux-2.4.29/drivers/isdn/avm
  #include <linux/capi.h>
  #include <linux/kernelcapi.h>
  #include <linux/init.h>
-@@ -29,7 +30,7 @@
+@@ -30,7 +31,7 @@
  #include "capilli.h"
  #include "avmcard.h"
  
@@ -998,7 +1027,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/c4.c linux-2.4.29/drivers/isdn/avm
  
  #undef CONFIG_C4_DEBUG
  #undef CONFIG_C4_POLLDEBUG
-@@ -38,6 +39,7 @@
+@@ -39,6 +40,7 @@
  
  static int suppress_pollack;
  
@@ -1006,7 +1035,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/c4.c linux-2.4.29/drivers/isdn/avm
  static struct pci_device_id c4_pci_tbl[] __initdata = {
  	{ PCI_VENDOR_ID_DEC,PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C4 },
  	{ PCI_VENDOR_ID_DEC,PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C2 },
-@@ -45,6 +47,7 @@
+@@ -46,6 +48,7 @@
  };
  
  MODULE_DEVICE_TABLE(pci, c4_pci_tbl);
@@ -1014,7 +1043,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/c4.c linux-2.4.29/drivers/isdn/avm
  MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM C2/C4 cards");
  MODULE_AUTHOR("Carsten Paeth");
  MODULE_LICENSE("GPL");
-@@ -1328,9 +1331,9 @@
+@@ -1332,9 +1335,9 @@
  		}
  		pci_set_master(dev);
  
@@ -1026,9 +1055,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/c4.c linux-2.4.29/drivers/isdn/avm
    
  		printk(KERN_INFO
  			"%s: PCI BIOS reports AVM-C%d at i/o %#x, irq %d, mem %#x\n",
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capi.c linux-2.4.29/drivers/isdn/avmb1/capi.c
---- linux-2.4.29.old/drivers/isdn/avmb1/capi.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/capi.c	2005-03-22 15:06:44.849274656 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capi.c	2007-12-15 05:19:39.550674902 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/capi.c	2007-12-15 05:19:55.507584236 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capi.c,v 1.1.4.2 2001/12/09 18:45:13 kai Exp $
 +/* $Id: capi.c,v 1.59 2001/11/07 22:35:48 kai Exp $
@@ -1863,27 +1893,30 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capi.c linux-2.4.29/drivers/isdn/a
  	(void) detach_capi_interface(&cuser);
  	printk(KERN_NOTICE "capi: Rev %s: unloaded\n", rev);
  }
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capicmd.h linux-2.4.29/drivers/isdn/avmb1/capicmd.h
---- linux-2.4.29.old/drivers/isdn/avmb1/capicmd.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/capicmd.h	2005-03-22 15:06:44.865272224 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/capicmd.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capicmd.h	2007-12-15 05:19:39.558675358 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/capicmd.h	2007-12-15 05:19:55.507584236 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capicmd.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: capicmd.h,v 1.4 2001/09/24 13:22:44 kai Exp $
   * 
   * CAPI 2.0 Interface for Linux
   * 
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capidev.h linux-2.4.29/drivers/isdn/avmb1/capidev.h
---- linux-2.4.29.old/drivers/isdn/avmb1/capidev.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/capidev.h	2005-03-22 15:06:44.880269944 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/capidev.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidev.h	2007-12-15 05:19:39.566675816 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/capidev.h	2007-12-15 05:19:55.511584462 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capidev.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: capidev.h,v 1.8 2001/09/24 13:22:44 kai Exp $
   *
   * CAPI 2.0 Interface for Linux
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capidrv.c linux-2.4.29/drivers/isdn/avmb1/capidrv.c
---- linux-2.4.29.old/drivers/isdn/avmb1/capidrv.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/capidrv.c	2005-03-22 15:06:44.918264168 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidrv.c	2007-12-15 05:19:39.570676042 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c	2007-12-15 05:19:55.511584462 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capidrv.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: capidrv.c,v 1.45 2001/09/24 13:22:44 kai Exp $
@@ -2061,18 +2094,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capidrv.c linux-2.4.29/drivers/isd
  	kfree(card->bchans);
  	card->bchans = 0;
  
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capidrv.h linux-2.4.29/drivers/isdn/avmb1/capidrv.h
---- linux-2.4.29.old/drivers/isdn/avmb1/capidrv.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/capidrv.h	2005-03-22 15:06:44.935261584 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidrv.h	2007-12-15 05:19:39.578676498 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/capidrv.h	2007-12-15 05:19:55.511584462 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capidrv.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: capidrv.h,v 1.4 2001/09/24 13:22:44 kai Exp $
   *
   * ISDN4Linux Driver, using capi20 interface (kernelcapi)
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capifs.c linux-2.4.29/drivers/isdn/avmb1/capifs.c
---- linux-2.4.29.old/drivers/isdn/avmb1/capifs.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/capifs.c	2005-03-22 15:06:44.950259304 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capifs.c	2007-12-15 05:19:39.586676956 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/capifs.c	2007-12-15 05:19:55.511584462 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capifs.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: capifs.c,v 1.22 2001/09/24 13:22:44 kai Exp $
@@ -2351,27 +2386,30 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capifs.c linux-2.4.29/drivers/isdn
  		}
  	}
  }
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capifs.h linux-2.4.29/drivers/isdn/avmb1/capifs.h
---- linux-2.4.29.old/drivers/isdn/avmb1/capifs.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/capifs.h	2005-03-22 15:06:44.965257024 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capifs.h	2007-12-15 05:19:39.594677411 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/capifs.h	2007-12-15 05:19:55.515584692 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capifs.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: capifs.h,v 1.4 2001/09/24 13:22:44 kai Exp $
   * 
   * Copyright 2000 by Carsten Paeth <calle@calle.de>
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capilli.h linux-2.4.29/drivers/isdn/avmb1/capilli.h
---- linux-2.4.29.old/drivers/isdn/avmb1/capilli.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/capilli.h	2005-03-22 15:06:44.980254744 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/capilli.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capilli.h	2007-12-15 05:19:39.598677637 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/capilli.h	2007-12-15 05:19:55.515584692 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capilli.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: capilli.h,v 1.5 2001/09/24 13:22:44 kai Exp $
   * 
   * Kernel CAPI 2.0 Driver Interface for Linux
   * 
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capiutil.c linux-2.4.29/drivers/isdn/avmb1/capiutil.c
---- linux-2.4.29.old/drivers/isdn/avmb1/capiutil.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/capiutil.c	2005-03-22 15:06:44.997252160 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/capiutil.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capiutil.c	2007-12-15 05:19:39.606678095 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/capiutil.c	2007-12-15 05:19:55.515584692 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capiutil.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: capiutil.c,v 1.16 2001/09/24 13:22:44 kai Exp $
@@ -2386,18 +2424,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capiutil.c linux-2.4.29/drivers/is
  #include "capiutil.h"
  
  MODULE_DESCRIPTION("CAPI4Linux: CAPI message conversion support");
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capiutil.h linux-2.4.29/drivers/isdn/avmb1/capiutil.h
---- linux-2.4.29.old/drivers/isdn/avmb1/capiutil.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/capiutil.h	2005-03-22 15:06:45.040245624 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/capiutil.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capiutil.h	2007-12-15 05:19:39.614678551 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/capiutil.h	2007-12-15 05:19:55.515584692 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capiutil.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: capiutil.h,v 1.7 2001/09/24 13:22:44 kai Exp $
   *
   * CAPI 2.0 defines & types
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/kcapi.c linux-2.4.29/drivers/isdn/avmb1/kcapi.c
---- linux-2.4.29.old/drivers/isdn/avmb1/kcapi.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/kcapi.c	2005-03-22 15:06:45.062242280 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/kcapi.c	2007-12-15 05:19:39.622679006 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c	2007-12-15 05:19:55.519584918 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: kcapi.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: kcapi.c,v 1.28 2001/09/24 13:22:44 kai Exp $
@@ -2573,9 +2613,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/kcapi.c linux-2.4.29/drivers/isdn/
          printk(KERN_NOTICE "kcapi: card %d \"%s\" ready.\n",
  		CARDNR(card), card->name);
  
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/t1isa.c linux-2.4.29/drivers/isdn/avmb1/t1isa.c
---- linux-2.4.29.old/drivers/isdn/avmb1/t1isa.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/t1isa.c	2005-03-22 15:06:45.078239848 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/t1isa.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/t1isa.c	2007-12-15 05:19:39.626679235 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/t1isa.c	2007-12-15 05:19:55.519584918 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: t1isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: t1isa.c,v 1.22 2001/09/24 13:22:44 kai Exp $
@@ -2598,9 +2639,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/t1isa.c linux-2.4.29/drivers/isdn/
  
  /* ------------------------------------------------------------- */
  
-diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/t1pci.c linux-2.4.29/drivers/isdn/avmb1/t1pci.c
---- linux-2.4.29.old/drivers/isdn/avmb1/t1pci.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/avmb1/t1pci.c	2005-03-22 15:06:45.094237416 +0100
+Index: linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/avmb1/t1pci.c	2007-12-15 05:19:39.634679691 +0100
++++ linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c	2007-12-15 05:19:55.519584918 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: t1pci.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: t1pci.c,v 1.25 2001/09/24 13:22:44 kai Exp $
@@ -2650,9 +2692,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/t1pci.c linux-2.4.29/drivers/isdn/
  
  		printk(KERN_INFO
  			"%s: PCI BIOS reports AVM-T1-PCI at i/o %#x, irq %d, mem %#x\n",
-diff -rNu linux-2.4.29.old/drivers/isdn/divert/divert_procfs.c linux-2.4.29/drivers/isdn/divert/divert_procfs.c
---- linux-2.4.29.old/drivers/isdn/divert/divert_procfs.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/divert/divert_procfs.c	2005-03-22 15:06:45.158227688 +0100
+Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/divert/divert_procfs.c	2007-12-15 05:19:39.642680146 +0100
++++ linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c	2007-12-15 05:19:55.519584918 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: divert_procfs.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id$
@@ -2773,9 +2816,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/divert/divert_procfs.c linux-2.4.29/driv
  #endif	/* CONFIG_PROC_FS */
  
  	return (0);
-diff -rNu linux-2.4.29.old/drivers/isdn/divert/isdn_divert.c linux-2.4.29/drivers/isdn/divert/isdn_divert.c
---- linux-2.4.29.old/drivers/isdn/divert/isdn_divert.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/divert/isdn_divert.c	2005-03-22 15:06:45.173225408 +0100
+Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/divert/isdn_divert.c	2007-12-15 05:19:39.650680601 +0100
++++ linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c	2007-12-15 05:19:55.523585147 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_divert.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id$
@@ -2831,9 +2875,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/divert/isdn_divert.c linux-2.4.29/driver
                     break;
   
  		   default:
-diff -rNu linux-2.4.29.old/drivers/isdn/divert/isdn_divert.h linux-2.4.29/drivers/isdn/divert/isdn_divert.h
---- linux-2.4.29.old/drivers/isdn/divert/isdn_divert.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/divert/isdn_divert.h	2005-03-22 15:06:45.189222976 +0100
+Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/divert/isdn_divert.h	2007-12-15 05:19:39.658681057 +0100
++++ linux-2.4.35.4/drivers/isdn/divert/isdn_divert.h	2007-12-15 05:19:55.523585147 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_divert.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id$
@@ -2862,9 +2907,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/divert/isdn_divert.h linux-2.4.29/driver
                         actions 1-2 only take place if interface is opened 
  		    */
     u_char waittime; /* maximum wait time for proceeding */ 
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/Divas_mod.c linux-2.4.29/drivers/isdn/eicon/Divas_mod.c
---- linux-2.4.29.old/drivers/isdn/eicon/Divas_mod.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/Divas_mod.c	2005-03-22 15:06:45.229216896 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/Divas_mod.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/Divas_mod.c	2007-12-15 05:19:39.666681515 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/Divas_mod.c	2007-12-15 05:19:55.523585147 +0100
 @@ -20,6 +20,7 @@
  #include "adapter.h"
  #include "uxio.h"
@@ -2873,9 +2919,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/Divas_mod.c linux-2.4.29/drivers/i
  
  MODULE_DESCRIPTION("ISDN4Linux: Driver for Eicon Diva Server cards");
  MODULE_AUTHOR("Armin Schindler");
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/common.c linux-2.4.29/drivers/isdn/eicon/common.c
---- linux-2.4.29.old/drivers/isdn/eicon/common.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/common.c	2005-03-22 15:06:45.301205952 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/common.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/common.c	2007-12-15 05:19:39.670681741 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/common.c	2007-12-15 05:19:55.523585147 +0100
 @@ -808,9 +808,7 @@
  	
  	while(i--)
@@ -2887,16 +2934,17 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/common.c linux-2.4.29/drivers/isdn
  	}
  }
  
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon.h linux-2.4.29/drivers/isdn/eicon/eicon.h
---- linux-2.4.29.old/drivers/isdn/eicon/eicon.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/eicon.h	2005-03-22 15:06:45.371195312 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/eicon.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon.h	2007-12-15 05:19:39.678682197 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/eicon.h	2007-12-15 05:19:55.523585147 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: eicon.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: eicon.h,v 1.26 2001/09/24 13:22:47 kai Exp $
   *
   * ISDN low-level module for Eicon active ISDN-Cards.
   *
-@@ -348,19 +348,19 @@
+@@ -347,19 +347,19 @@
  extern char *eicon_ctype_name[];
  
  
@@ -2919,18 +2967,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon.h linux-2.4.29/drivers/isdn/
  {
          queue_task(&card->ack_tq, &tq_immediate);
          mark_bh(IMMEDIATE_BH);
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_dsp.h linux-2.4.29/drivers/isdn/eicon/eicon_dsp.h
---- linux-2.4.29.old/drivers/isdn/eicon/eicon_dsp.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/eicon_dsp.h	2005-03-22 15:06:45.386193032 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_dsp.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_dsp.h	2007-12-15 05:19:39.686682655 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/eicon_dsp.h	2007-12-15 05:19:55.523585147 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: eicon_dsp.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: eicon_dsp.h,v 1.8 2001/09/24 13:22:47 kai Exp $
   *
   * ISDN lowlevel-module for Eicon active cards.
   * DSP definitions
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_idi.c linux-2.4.29/drivers/isdn/eicon/eicon_idi.c
---- linux-2.4.29.old/drivers/isdn/eicon/eicon_idi.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/eicon_idi.c	2005-03-22 15:06:45.421187712 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_idi.c	2007-12-15 05:19:39.694683110 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c	2007-12-15 05:19:55.527585376 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: eicon_idi.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: eicon_idi.c,v 1.45 2001/11/07 22:35:48 kai Exp $
@@ -3007,27 +3057,30 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_idi.c linux-2.4.29/drivers/i
  					chan->statectrl &= ~WAITING_FOR_HANGUP;
  					chan->statectrl &= ~IN_HOLD;
  					if (chan->statectrl & HAVE_CONN_REQ) {
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_idi.h linux-2.4.29/drivers/isdn/eicon/eicon_idi.h
---- linux-2.4.29.old/drivers/isdn/eicon/eicon_idi.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/eicon_idi.h	2005-03-22 15:06:45.437185280 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_idi.h	2007-12-15 05:19:39.698683336 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.h	2007-12-15 05:19:55.527585376 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: eicon_idi.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: eicon_idi.h,v 1.12 2001/09/24 13:22:47 kai Exp $
   *
   * ISDN lowlevel-module for the Eicon active cards.
   * IDI-Interface
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_io.c linux-2.4.29/drivers/isdn/eicon/eicon_io.c
---- linux-2.4.29.old/drivers/isdn/eicon/eicon_io.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/eicon_io.c	2005-03-22 15:06:45.453182848 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_io.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_io.c	2007-12-15 05:19:39.706683794 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/eicon_io.c	2007-12-15 05:19:55.531585602 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: eicon_io.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: eicon_io.c,v 1.15 2001/09/24 13:22:47 kai Exp $
   *
   * ISDN low-level module for Eicon active ISDN-Cards.
   * Code for communicating with hardware.
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_isa.c linux-2.4.29/drivers/isdn/eicon/eicon_isa.c
---- linux-2.4.29.old/drivers/isdn/eicon/eicon_isa.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/eicon_isa.c	2005-03-22 15:06:45.469180416 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_isa.c	2007-12-15 05:19:39.714684250 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c	2007-12-15 05:19:55.531585602 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: eicon_isa.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: eicon_isa.c,v 1.18 2001/11/07 22:35:48 kai Exp $
@@ -3119,18 +3172,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_isa.c linux-2.4.29/drivers/i
  #ifdef EICON_MCA_DEBUG
  	printk(KERN_INFO "eicon_isa_boot: card->ramsize = %d.\n", card->ramsize);
  #endif
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_isa.h linux-2.4.29/drivers/isdn/eicon/eicon_isa.h
---- linux-2.4.29.old/drivers/isdn/eicon/eicon_isa.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/eicon_isa.h	2005-03-22 15:06:45.485177984 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_isa.h	2007-12-15 05:19:39.722684705 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.h	2007-12-15 05:19:55.531585602 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: eicon_isa.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: eicon_isa.h,v 1.11 2001/09/24 13:22:47 kai Exp $
   *
   * ISDN low-level module for Eicon active ISDN-Cards.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_mod.c linux-2.4.29/drivers/isdn/eicon/eicon_mod.c
---- linux-2.4.29.old/drivers/isdn/eicon/eicon_mod.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/eicon_mod.c	2005-03-22 15:06:45.505174944 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_mod.c	2007-12-15 05:19:39.726684934 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c	2007-12-15 05:19:55.531585602 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: eicon_mod.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: eicon_mod.c,v 1.44 2001/11/20 09:48:25 armin Exp $
@@ -3213,9 +3268,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_mod.c linux-2.4.29/drivers/i
  
  #endif /* MODULE */
  
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_pci.c linux-2.4.29/drivers/isdn/eicon/eicon_pci.c
---- linux-2.4.29.old/drivers/isdn/eicon/eicon_pci.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/eicon_pci.c	2005-03-22 15:06:45.522172360 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_pci.c	2007-12-15 05:19:39.734685390 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.c	2007-12-15 05:19:55.535585832 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: eicon_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: eicon_pci.c,v 1.18 2001/09/24 13:22:47 kai Exp $
@@ -3231,18 +3287,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_pci.c linux-2.4.29/drivers/i
  
  #if CONFIG_PCI	         /* intire stuff is only for PCI */
  #ifdef CONFIG_ISDN_DRV_EICON_PCI
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_pci.h linux-2.4.29/drivers/isdn/eicon/eicon_pci.h
---- linux-2.4.29.old/drivers/isdn/eicon/eicon_pci.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/eicon_pci.h	2005-03-22 15:06:45.538169928 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_pci.h	2007-12-15 05:19:39.742685845 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.h	2007-12-15 05:19:55.535585832 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: eicon_pci.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: eicon_pci.h,v 1.7 2001/09/24 13:22:47 kai Exp $
   *
   * ISDN low-level module for Eicon active ISDN-Cards (PCI part).
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/fourbri.c linux-2.4.29/drivers/isdn/eicon/fourbri.c
---- linux-2.4.29.old/drivers/isdn/eicon/fourbri.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/fourbri.c	2005-03-22 15:06:45.553167648 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/fourbri.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/fourbri.c	2007-12-15 05:19:39.750686300 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/fourbri.c	2007-12-15 05:19:55.535585832 +0100
 @@ -337,8 +337,7 @@
  static int diva_server_4bri_start(card_t *card, byte *channels)
  {
@@ -3253,9 +3311,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/fourbri.c linux-2.4.29/drivers/isd
  	int adapter_num;
  
  	DPRINTF(("divas: start Diva Server 4BRI"));
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/kprintf.c linux-2.4.29/drivers/isdn/eicon/kprintf.c
---- linux-2.4.29.old/drivers/isdn/eicon/kprintf.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/kprintf.c	2005-03-22 15:06:45.601160352 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/kprintf.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/kprintf.c	2007-12-15 05:19:39.754686529 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/kprintf.c	2007-12-15 05:19:55.535585832 +0100
 @@ -18,6 +18,468 @@
  #include "divalog.h"
  #include "uxio.h"
@@ -3734,9 +3793,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/kprintf.c linux-2.4.29/drivers/isd
  
      va_end(argptr);
  
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/lincfg.c linux-2.4.29/drivers/isdn/eicon/lincfg.c
---- linux-2.4.29.old/drivers/isdn/eicon/lincfg.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/lincfg.c	2005-03-22 15:06:45.620157464 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/lincfg.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/lincfg.c	2007-12-15 05:19:39.762686985 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/lincfg.c	2007-12-15 05:19:55.535585832 +0100
 @@ -26,6 +26,9 @@
  #include "uxio.h"
  
@@ -3747,9 +3807,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/lincfg.c linux-2.4.29/drivers/isdn
  #include <linux/kernel.h>
  #include <linux/ioport.h>
  
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/linchr.c linux-2.4.29/drivers/isdn/eicon/linchr.c
---- linux-2.4.29.old/drivers/isdn/eicon/linchr.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/linchr.c	2005-03-22 15:06:45.635155184 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/linchr.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/linchr.c	2007-12-15 05:19:39.770687440 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/linchr.c	2007-12-15 05:19:55.539586058 +0100
 @@ -154,17 +154,17 @@
  	klog_t *pHeadItem;
  
@@ -3773,9 +3834,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/linchr.c linux-2.4.29/drivers/isdn
  		kfree(pHeadItem);
  		return sizeof(klog_t);
  	}
-diff -rNu linux-2.4.29.old/drivers/isdn/eicon/linio.c linux-2.4.29/drivers/isdn/eicon/linio.c
---- linux-2.4.29.old/drivers/isdn/eicon/linio.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/eicon/linio.c	2005-03-22 15:06:45.651152752 +0100
+Index: linux-2.4.35.4/drivers/isdn/eicon/linio.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/eicon/linio.c	2007-12-15 05:19:39.778687896 +0100
++++ linux-2.4.35.4/drivers/isdn/eicon/linio.c	2007-12-15 05:19:55.539586058 +0100
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/pci.h>
@@ -3784,9 +3846,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/eicon/linio.c linux-2.4.29/drivers/isdn/
  #undef N_DATA
  
  #include "uxio.h"
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/Makefile linux-2.4.29/drivers/isdn/hisax/Makefile
---- linux-2.4.29.old/drivers/isdn/hisax/Makefile	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/Makefile	2005-03-22 15:06:45.819127216 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/Makefile	2007-12-15 05:19:39.786688354 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/Makefile	2007-12-15 05:19:55.539586058 +0100
 @@ -4,20 +4,17 @@
  
  O_TARGET	  := vmlinux-obj.o
@@ -3850,9 +3913,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/Makefile linux-2.4.29/drivers/isdn
  
  CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
  CFLAGS_cert.o := -DCERTIFICATION=$(CERT)
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/amd7930.c linux-2.4.29/drivers/isdn/hisax/amd7930.c
---- linux-2.4.29.old/drivers/isdn/hisax/amd7930.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/amd7930.c	2005-03-22 15:06:45.837124480 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/amd7930.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/isdn/hisax/amd7930.c	2007-12-15 05:19:55.539586058 +0100
 @@ -0,0 +1,755 @@
 +/* $Id: amd7930.c,v 1.8 2001/09/24 13:22:55 kai Exp $
 + *
@@ -4609,27 +4673,30 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/amd7930.c linux-2.4.29/drivers/isd
 +
 +	return (1);
 +}
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/arcofi.c linux-2.4.29/drivers/isdn/hisax/arcofi.c
---- linux-2.4.29.old/drivers/isdn/hisax/arcofi.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/arcofi.c	2005-03-22 15:06:45.852122200 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/arcofi.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/arcofi.c	2007-12-15 05:19:39.798689035 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/arcofi.c	2007-12-15 05:19:55.539586058 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: arcofi.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: arcofi.c,v 1.14 2001/09/24 13:22:55 kai Exp $
   *
   * Ansteuerung ARCOFI 2165
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/arcofi.h linux-2.4.29/drivers/isdn/hisax/arcofi.h
---- linux-2.4.29.old/drivers/isdn/hisax/arcofi.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/arcofi.h	2005-03-22 15:06:45.872119160 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/arcofi.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/arcofi.h	2007-12-15 05:19:39.802689264 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/arcofi.h	2007-12-15 05:19:55.543586286 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: arcofi.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id$
   *
   * Ansteuerung ARCOFI 2165
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/asuscom.c linux-2.4.29/drivers/isdn/hisax/asuscom.c
---- linux-2.4.29.old/drivers/isdn/hisax/asuscom.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/asuscom.c	2005-03-22 15:06:45.889116576 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/asuscom.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/asuscom.c	2007-12-15 05:19:39.810689720 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/asuscom.c	2007-12-15 05:19:55.543586286 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: asuscom.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: asuscom.c,v 1.14 2001/09/24 13:22:55 kai Exp $
@@ -4728,9 +4795,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/asuscom.c linux-2.4.29/drivers/isd
  	bytecnt = 8;
  	cs->hw.asus.cfg_reg = card->para[1];
  	cs->irq = card->para[0];
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/avm_a1.c linux-2.4.29/drivers/isdn/hisax/avm_a1.c
---- linux-2.4.29.old/drivers/isdn/hisax/avm_a1.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/avm_a1.c	2005-03-22 15:06:45.904114296 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/avm_a1.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_a1.c	2007-12-15 05:19:39.818690175 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/avm_a1.c	2007-12-15 05:19:55.543586286 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: avm_a1.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: avm_a1.c,v 2.15 2001/09/24 13:22:55 kai Exp $
@@ -4746,9 +4814,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/avm_a1.c linux-2.4.29/drivers/isdn
  
  #define	 AVM_A1_STAT_ISAC	0x01
  #define	 AVM_A1_STAT_HSCX	0x02
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/avm_a1p.c linux-2.4.29/drivers/isdn/hisax/avm_a1p.c
---- linux-2.4.29.old/drivers/isdn/hisax/avm_a1p.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/avm_a1p.c	2005-03-22 15:06:45.919112016 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/avm_a1p.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_a1p.c	2007-12-15 05:19:39.826690633 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/avm_a1p.c	2007-12-15 05:19:55.543586286 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: avm_a1p.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: avm_a1p.c,v 2.9 2001/09/24 13:22:55 kai Exp $
@@ -4764,9 +4833,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/avm_a1p.c linux-2.4.29/drivers/isd
  
  static inline u_char
  ReadISAC(struct IsdnCardState *cs, u_char offset)
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/avm_pci.c linux-2.4.29/drivers/isdn/hisax/avm_pci.c
---- linux-2.4.29.old/drivers/isdn/hisax/avm_pci.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/avm_pci.c	2005-03-22 15:06:45.945108064 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_pci.c	2007-12-15 05:19:39.830690859 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c	2007-12-15 05:19:55.543586286 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: avm_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: avm_pci.c,v 1.29 2001/09/24 13:22:55 kai Exp $
@@ -4883,9 +4953,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/avm_pci.c linux-2.4.29/drivers/isd
  	cs->hw.avm.isac = cs->hw.avm.cfg_reg + 0x10;
  	if (check_region((cs->hw.avm.cfg_reg), 32)) {
  		printk(KERN_WARNING
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/bkm_a4t.c linux-2.4.29/drivers/isdn/hisax/bkm_a4t.c
---- linux-2.4.29.old/drivers/isdn/hisax/bkm_a4t.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/bkm_a4t.c	2005-03-22 15:06:45.962105480 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a4t.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_a4t.c	2007-12-15 05:19:39.838691315 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/bkm_a4t.c	2007-12-15 05:19:55.547586516 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: bkm_a4t.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: bkm_a4t.c,v 1.22 2001/09/24 13:22:55 kai Exp $
@@ -4923,9 +4994,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/bkm_a4t.c linux-2.4.29/drivers/isd
  			cs->irq = dev_a4t->irq;
  			break;
  		}
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/bkm_a8.c linux-2.4.29/drivers/isdn/hisax/bkm_a8.c
---- linux-2.4.29.old/drivers/isdn/hisax/bkm_a8.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/bkm_a8.c	2005-03-22 15:06:45.982102440 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_a8.c	2007-12-15 05:19:39.846691773 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c	2007-12-15 05:19:55.547586516 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: bkm_a8.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: bkm_a8.c,v 1.22 2001/09/24 13:22:55 kai Exp $
@@ -4975,18 +5047,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/bkm_a8.c linux-2.4.29/drivers/isdn
  		}
  #endif /* End HACK */
  	}
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/bkm_ax.h linux-2.4.29/drivers/isdn/hisax/bkm_ax.h
---- linux-2.4.29.old/drivers/isdn/hisax/bkm_ax.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/bkm_ax.h	2005-03-22 15:06:46.010098184 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_ax.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_ax.h	2007-12-15 05:19:39.854692228 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/bkm_ax.h	2007-12-15 05:19:55.547586516 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: bkm_ax.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id$
   *
   * low level decls for T-Berkom cards A4T and Scitel Quadro (4*S0, passive)
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/callc.c linux-2.4.29/drivers/isdn/hisax/callc.c
---- linux-2.4.29.old/drivers/isdn/hisax/callc.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/callc.c	2005-03-22 15:06:46.027095600 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/callc.c	2007-12-15 05:19:39.862692684 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/callc.c	2007-12-15 05:19:55.547586516 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: callc.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: callc.c,v 2.59 2002/02/09 21:19:11 keil Exp $
@@ -5079,18 +5153,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/callc.c linux-2.4.29/drivers/isdn/
  		case (CC_PROGRESS | INDICATION):
  		case (CC_NOTIFY | INDICATION):
  			break;
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/cert.c linux-2.4.29/drivers/isdn/hisax/cert.c
---- linux-2.4.29.old/drivers/isdn/hisax/cert.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/cert.c	2005-03-22 15:06:46.042093320 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/cert.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/cert.c	2007-12-15 05:19:39.866692913 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/cert.c	2007-12-15 05:19:55.551586742 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: cert.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: cert.c,v 2.6 2001/09/24 13:22:56 kai Exp $
   *
   * Author       Karsten Keil
   * Copyright    by Karsten Keil      <keil@isdn4linux.de>
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/config.c linux-2.4.29/drivers/isdn/hisax/config.c
---- linux-2.4.29.old/drivers/isdn/hisax/config.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/config.c	2005-03-22 15:06:46.077088000 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/config.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/config.c	2007-12-15 05:19:39.874693368 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/config.c	2007-12-15 05:19:55.551586742 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: config.c,v 1.1.4.5 2001/12/09 19:19:26 kai Exp $
 +/* $Id: config.c,v 2.84 2002/08/13 09:55:29 keil Exp $
@@ -5580,9 +5656,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/config.c linux-2.4.29/drivers/isdn
 -EXPORT_SYMBOL(FsmInitTimer);
 -EXPORT_SYMBOL(FsmDelTimer);
 -EXPORT_SYMBOL(FsmRestartTimer);
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/diva.c linux-2.4.29/drivers/isdn/hisax/diva.c
---- linux-2.4.29.old/drivers/isdn/hisax/diva.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/diva.c	2005-03-22 15:06:46.106083592 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/diva.c	2007-12-15 05:19:39.882693823 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/diva.c	2007-12-15 05:19:55.551586742 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: diva.c,v 1.1.4.2 2002/08/30 11:21:00 keil Exp $
 +/* $Id: diva.c,v 1.33 2001/09/24 13:22:56 kai Exp $
@@ -6003,9 +6080,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/diva.c linux-2.4.29/drivers/isdn/h
  	} else { /* DIVA 2.0 */
  		cs->hw.diva.tl.function = (void *) diva_led_handler;
  		cs->hw.diva.tl.data = (long) cs;
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/elsa.c linux-2.4.29/drivers/isdn/hisax/elsa.c
---- linux-2.4.29.old/drivers/isdn/hisax/elsa.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/elsa.c	2005-03-22 15:06:46.123081008 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/elsa.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa.c	2007-12-15 05:19:39.890694279 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/elsa.c	2007-12-15 05:19:55.555586971 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: elsa.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: elsa.c,v 2.32 2001/09/24 13:22:56 kai Exp $
@@ -6151,9 +6229,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/elsa.c linux-2.4.29/drivers/isdn/h
  		case ELSA_QS3000PCI:
  			bytecnt = 16;
  			break;
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/elsa_cs.c linux-2.4.29/drivers/isdn/hisax/elsa_cs.c
---- linux-2.4.29.old/drivers/isdn/hisax/elsa_cs.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/elsa_cs.c	2005-03-22 15:06:46.138078728 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/elsa_cs.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa_cs.c	2007-12-15 05:19:39.894694508 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/elsa_cs.c	2007-12-15 05:19:55.555586971 +0100
 @@ -72,7 +72,7 @@
  MODULE_PARM(pc_debug, "i");
  #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args);
@@ -6163,9 +6242,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/elsa_cs.c linux-2.4.29/drivers/isd
  #else
  #define DEBUG(n, args...)
  #endif
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/elsa_ser.c linux-2.4.29/drivers/isdn/hisax/elsa_ser.c
---- linux-2.4.29.old/drivers/isdn/hisax/elsa_ser.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/elsa_ser.c	2005-03-22 15:06:46.158075688 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/elsa_ser.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa_ser.c	2007-12-15 05:19:39.902694963 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/elsa_ser.c	2007-12-15 05:19:55.555586971 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: elsa_ser.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: elsa_ser.c,v 2.14 2001/09/24 13:22:56 kai Exp $
@@ -6247,9 +6327,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/elsa_ser.c linux-2.4.29/drivers/is
  
  static void rs_interrupt_elsa(int irq, struct IsdnCardState *cs)
  {
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/fsm.c linux-2.4.29/drivers/isdn/hisax/fsm.c
---- linux-2.4.29.old/drivers/isdn/hisax/fsm.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/fsm.c	2005-03-22 15:06:46.174073256 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/fsm.c	2007-12-15 05:19:39.910695419 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/fsm.c	2007-12-15 05:19:55.555586971 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: fsm.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id$
@@ -6271,18 +6352,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/fsm.c linux-2.4.29/drivers/isdn/hi
  int __init
  FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount)
  {
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/fsm.h linux-2.4.29/drivers/isdn/hisax/fsm.h
---- linux-2.4.29.old/drivers/isdn/hisax/fsm.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/fsm.h	2005-03-22 15:06:46.189070976 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/fsm.h	2007-12-15 05:19:39.918695874 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/fsm.h	2007-12-15 05:19:55.555586971 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: fsm.h,v 1.1.2.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id$
   *
   * Finite state machine
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/gazel.c linux-2.4.29/drivers/isdn/hisax/gazel.c
---- linux-2.4.29.old/drivers/isdn/hisax/gazel.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/gazel.c	2005-03-22 15:06:46.205068544 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/gazel.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/gazel.c	2007-12-15 05:19:39.922696103 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/gazel.c	2007-12-15 05:19:55.559587200 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: gazel.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: gazel.c,v 2.19 2001/09/24 13:22:56 kai Exp $
@@ -6312,9 +6395,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/gazel.c linux-2.4.29/drivers/isdn/
  			found = 1;
  		}
  		if (found)
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_2bds0.c linux-2.4.29/drivers/isdn/hisax/hfc_2bds0.c
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_2bds0.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_2bds0.c	2005-03-22 15:06:46.221066112 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bds0.c	2007-12-15 05:19:39.930696558 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c	2007-12-15 05:19:55.559587200 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hfc_2bds0.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: hfc_2bds0.c,v 1.18 2001/09/24 13:22:56 kai Exp $
@@ -6393,36 +6477,40 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_2bds0.c linux-2.4.29/drivers/i
  }
  
  unsigned int __init
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_2bds0.h linux-2.4.29/drivers/isdn/hisax/hfc_2bds0.h
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_2bds0.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_2bds0.h	2005-03-22 15:06:46.236063832 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bds0.h	2007-12-15 05:19:39.938697014 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.h	2007-12-15 05:19:55.559587200 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hfc_2bds0.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: hfc_2bds0.h,v 1.6 2001/09/24 13:22:56 kai Exp $
   *
   * specific defines for CCD's HFC 2BDS0
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_2bs0.c linux-2.4.29/drivers/isdn/hisax/hfc_2bs0.c
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_2bs0.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_2bs0.c	2005-03-22 15:06:46.272058360 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bs0.c	2007-12-15 05:19:39.946697472 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.c	2007-12-15 05:19:55.559587200 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hfc_2bs0.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: hfc_2bs0.c,v 1.20 2001/09/24 13:22:56 kai Exp $
   *
   * specific routines for CCD's HFC 2BS0
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_2bs0.h linux-2.4.29/drivers/isdn/hisax/hfc_2bs0.h
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_2bs0.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_2bs0.h	2005-03-22 15:06:46.288055928 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bs0.h	2007-12-15 05:19:39.954697927 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.h	2007-12-15 05:19:55.563587427 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hfc_2bs0.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: hfc_2bs0.h,v 1.5 2001/09/24 13:22:56 kai Exp $
   *
   * specific defines for CCD's HFC 2BS0
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_pci.c linux-2.4.29/drivers/isdn/hisax/hfc_pci.c
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_pci.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_pci.c	2005-03-22 15:06:46.305053344 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_pci.c	2007-12-15 05:19:39.958698154 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c	2007-12-15 05:19:55.567587653 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hfc_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: hfc_pci.c,v 1.48 2001/09/24 13:22:56 kai Exp $
@@ -6544,18 +6632,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_pci.c linux-2.4.29/drivers/isd
  		    (((ulong) cs->hw.hfcpci.share_start) & ~0x7FFF) + 0x8000;
  		pcibios_write_config_dword(cs->hw.hfcpci.pci_bus,
  				       cs->hw.hfcpci.pci_device_fn, 0x80,
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_pci.h linux-2.4.29/drivers/isdn/hisax/hfc_pci.h
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_pci.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_pci.h	2005-03-22 15:06:46.320051064 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_pci.h	2007-12-15 05:19:39.966698612 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.h	2007-12-15 05:19:55.571587882 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hfc_pci.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: hfc_pci.h,v 1.10 2001/09/24 13:22:56 kai Exp $
   *
   * specific defines for CCD's HFC 2BDS0 PCI chips
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_sx.c linux-2.4.29/drivers/isdn/hisax/hfc_sx.c
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_sx.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_sx.c	2005-03-22 15:06:46.350046504 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_sx.c	2007-12-15 05:19:39.974699067 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c	2007-12-15 05:19:55.571587882 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hfc_sx.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: hfc_sx.c,v 1.12 2001/09/24 13:22:56 kai Exp $
@@ -6686,18 +6776,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_sx.c linux-2.4.29/drivers/isdn
 +
 +
 +
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_sx.h linux-2.4.29/drivers/isdn/hisax/hfc_sx.h
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_sx.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_sx.h	2005-03-22 15:06:46.365044224 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_sx.h	2007-12-15 05:19:39.982699522 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.h	2007-12-15 05:19:55.571587882 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hfc_sx.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id$
   *
   * specific defines for CCD's HFC 2BDS0 S+,SP chips
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_usb.c linux-2.4.29/drivers/isdn/hisax/hfc_usb.c
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_usb.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_usb.c	2005-03-22 15:06:46.381041792 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c	2007-12-15 05:19:55.575588111 +0100
 @@ -0,0 +1,1189 @@
 +/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $
 + *
@@ -7888,9 +7980,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_usb.c linux-2.4.29/drivers/isd
 +
 +module_init(hfc_usb_init);
 +module_exit(hfc_usb_exit);
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_usbr.c linux-2.4.29/drivers/isdn/hisax/hfc_usbr.c
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_usbr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_usbr.c	2005-03-22 15:06:46.397039360 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usbr.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usbr.c	2007-12-15 05:19:55.575588111 +0100
 @@ -0,0 +1,471 @@
 +/* $Id: hfc_usbr.c,v 2.5 2001/07/06 21:30:11 werner Exp $
 +
@@ -8363,9 +8456,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_usbr.c linux-2.4.29/drivers/is
 +	cs->cardmsg = &hfcusb_card_msg;
 +	return (1);		/* success */
 +}
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfcscard.c linux-2.4.29/drivers/isdn/hisax/hfcscard.c
---- linux-2.4.29.old/drivers/isdn/hisax/hfcscard.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfcscard.c	2005-03-22 15:06:46.412037080 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfcscard.c	2007-12-15 05:19:39.998700433 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c	2007-12-15 05:19:55.575588111 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hfcscard.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
 +/* $Id: hfcscard.c,v 1.10 2001/09/24 13:22:56 kai Exp $
@@ -8472,9 +8566,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfcscard.c linux-2.4.29/drivers/is
  	cs->hw.hfcD.addr = card->para[1] & 0xfffe;
  	cs->irq = card->para[0];
  	cs->hw.hfcD.cip = 0;
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax.h linux-2.4.29/drivers/isdn/hisax/hisax.h
---- linux-2.4.29.old/drivers/isdn/hisax/hisax.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hisax.h	2005-03-22 15:06:46.431034192 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax.h	2007-12-15 05:19:40.006700891 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hisax.h	2007-12-15 05:19:55.579588340 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hisax.h,v 1.1.4.2 2001/12/09 19:15:28 kai Exp $
 +/* $Id: hisax.h,v 2.64 2001/09/24 13:22:56 kai Exp $
@@ -8591,9 +8686,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax.h linux-2.4.29/drivers/isdn/
  #define TEI_PER_CARD 1
  
  /* L1 Debug */
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_debug.h linux-2.4.29/drivers/isdn/hisax/hisax_debug.h
---- linux-2.4.29.old/drivers/isdn/hisax/hisax_debug.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hisax_debug.h	2005-03-22 15:06:46.452031000 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_debug.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_debug.h	2007-12-15 05:19:40.014701347 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_debug.h	2007-12-15 05:19:55.579588340 +0100
 @@ -28,7 +28,7 @@
  
  #define DBG(level, format, arg...) do { \
@@ -8603,9 +8699,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_debug.h linux-2.4.29/drivers
  } while (0)
  
  #define DBG_PACKET(level,data,count) \
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_fcpcipnp.c linux-2.4.29/drivers/isdn/hisax/hisax_fcpcipnp.c
---- linux-2.4.29.old/drivers/isdn/hisax/hisax_fcpcipnp.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hisax_fcpcipnp.c	2005-03-22 15:06:46.468028568 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_fcpcipnp.c	2007-12-15 05:19:40.018701573 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c	2007-12-15 05:19:55.579588340 +0100
 @@ -20,22 +20,19 @@
   *
   * o POWER PC
@@ -9041,9 +9138,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_fcpcipnp.c linux-2.4.29/driv
 +#ifdef __ISAPNP__
 +#include "hisax_isapnp.c"
 +#endif
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_fcpcipnp.h linux-2.4.29/drivers/isdn/hisax/hisax_fcpcipnp.h
---- linux-2.4.29.old/drivers/isdn/hisax/hisax_fcpcipnp.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hisax_fcpcipnp.h	2005-03-22 15:06:46.484026136 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_fcpcipnp.h	2007-12-15 05:19:40.026702031 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.h	2007-12-15 05:19:55.579588340 +0100
 @@ -43,10 +43,12 @@
  };
  
@@ -9058,9 +9156,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_fcpcipnp.h linux-2.4.29/driv
  	struct isac isac;
  
  	struct fritz_bcs bcs[2];
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isac.c linux-2.4.29/drivers/isdn/hisax/hisax_isac.c
---- linux-2.4.29.old/drivers/isdn/hisax/hisax_isac.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hisax_isac.c	2005-03-22 15:06:46.543017168 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_isac.c	2007-12-15 05:19:40.034702487 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c	2007-12-15 05:19:55.583588567 +0100
 @@ -34,7 +34,7 @@
  static int debug = 1;
  MODULE_PARM(debug, "i");
@@ -9166,9 +9265,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isac.c linux-2.4.29/drivers/
  
  module_init(hisax_isac_init);
  module_exit(hisax_isac_exit);
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isac.h linux-2.4.29/drivers/isdn/hisax/hisax_isac.h
---- linux-2.4.29.old/drivers/isdn/hisax/hisax_isac.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hisax_isac.h	2005-03-22 15:06:46.559014736 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_isac.h	2007-12-15 05:19:40.042702942 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h	2007-12-15 05:19:55.583588567 +0100
 @@ -8,7 +8,7 @@
  #define TIMER3_VALUE 7000
  #define MAX_DFRAME_LEN_L1 300
@@ -9190,9 +9290,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isac.h linux-2.4.29/drivers/
 +void isacsx_interrupt(struct isac *isac);
  
  #endif
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isapnp.c linux-2.4.29/drivers/isdn/hisax/hisax_isapnp.c
---- linux-2.4.29.old/drivers/isdn/hisax/hisax_isapnp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hisax_isapnp.c	2005-03-22 15:06:46.576012152 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c	2007-12-15 05:19:55.583588567 +0100
 @@ -0,0 +1,105 @@
 +// FIXME copied
 +static const struct isapnp_device_id *
@@ -9299,9 +9400,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isapnp.c linux-2.4.29/driver
 +	}
 +}
 +
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isapnp.h linux-2.4.29/drivers/isdn/hisax/hisax_isapnp.h
---- linux-2.4.29.old/drivers/isdn/hisax/hisax_isapnp.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hisax_isapnp.h	2005-03-22 15:06:46.590010024 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h	2007-12-15 05:19:55.583588567 +0100
 @@ -0,0 +1,33 @@
 +#ifndef __HISAX_ISAPNP_H__
 +#define __HISAX_ISAPNP_H__
@@ -9336,9 +9438,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isapnp.h linux-2.4.29/driver
 +#endif
 +
 +#endif
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_loadable.h linux-2.4.29/drivers/isdn/hisax/hisax_loadable.h
---- linux-2.4.29.old/drivers/isdn/hisax/hisax_loadable.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hisax_loadable.h	2005-03-22 15:06:46.606007592 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_loadable.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_loadable.h	2007-12-15 05:19:55.583588567 +0100
 @@ -0,0 +1,74 @@
 +/* $Id: hisax_loadable.h,v 2.1 2001/06/08 22:19:16 werner Exp $
 + *
@@ -9414,81 +9517,90 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_loadable.h linux-2.4.29/driv
 +/* definition of the register function */
 +/***************************************/
 +extern int hisax_register_hfcusb(struct hisax_drvreg *l1drv);
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hscx.c linux-2.4.29/drivers/isdn/hisax/hscx.c
---- linux-2.4.29.old/drivers/isdn/hisax/hscx.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hscx.c	2005-03-22 15:06:46.621005312 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hscx.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx.c	2007-12-15 05:19:40.066704311 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hscx.c	2007-12-15 05:19:55.583588567 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hscx.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: hscx.c,v 1.24 2001/09/24 13:22:56 kai Exp $
   *
   * HSCX specific routines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hscx.h linux-2.4.29/drivers/isdn/hisax/hscx.h
---- linux-2.4.29.old/drivers/isdn/hisax/hscx.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hscx.h	2005-03-22 15:06:46.640002424 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hscx.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx.h	2007-12-15 05:19:40.070704537 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hscx.h	2007-12-15 05:19:55.587588793 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hscx.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: hscx.h,v 1.8 2001/09/24 13:22:56 kai Exp $
   *
   * HSCX specific defines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hscx_irq.c linux-2.4.29/drivers/isdn/hisax/hscx_irq.c
---- linux-2.4.29.old/drivers/isdn/hisax/hscx_irq.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hscx_irq.c	2005-03-22 15:06:46.655999992 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hscx_irq.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx_irq.c	2007-12-15 05:19:40.078704992 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hscx_irq.c	2007-12-15 05:19:55.587588793 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hscx_irq.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: hscx_irq.c,v 1.18 2001/09/24 13:22:56 kai Exp $
   *
   * low level b-channel stuff for Siemens HSCX
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/icc.c linux-2.4.29/drivers/isdn/hisax/icc.c
---- linux-2.4.29.old/drivers/isdn/hisax/icc.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/icc.c	2005-03-22 15:06:46.672997408 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/icc.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/icc.c	2007-12-15 05:19:40.086705450 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/icc.c	2007-12-15 05:19:55.587588793 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: icc.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: icc.c,v 1.8 2001/09/24 13:22:56 kai Exp $
   *
   * ICC specific routines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/icc.h linux-2.4.29/drivers/isdn/hisax/icc.h
---- linux-2.4.29.old/drivers/isdn/hisax/icc.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/icc.h	2005-03-22 15:06:46.687995128 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/icc.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/icc.h	2007-12-15 05:19:40.094705906 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/icc.h	2007-12-15 05:19:55.587588793 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: icc.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: icc.h,v 1.4 2001/09/24 13:22:56 kai Exp $
   *
   * ICC specific routines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/ipac.h linux-2.4.29/drivers/isdn/hisax/ipac.h
---- linux-2.4.29.old/drivers/isdn/hisax/ipac.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/ipac.h	2005-03-22 15:06:46.702992848 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/ipac.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/ipac.h	2007-12-15 05:19:40.098706132 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/ipac.h	2007-12-15 05:19:55.587588793 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: ipac.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: ipac.h,v 1.7 2001/09/24 13:22:56 kai Exp $
   *
   * IPAC specific defines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isac.c linux-2.4.29/drivers/isdn/hisax/isac.c
---- linux-2.4.29.old/drivers/isdn/hisax/isac.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isac.c	2005-03-22 15:06:46.844971264 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isac.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isac.c	2007-12-15 05:19:40.106706590 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isac.c	2007-12-15 05:19:55.591589021 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isac.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: isac.c,v 1.31 2001/09/24 13:22:56 kai Exp $
   *
   * ISAC specific routines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isac.h linux-2.4.29/drivers/isdn/hisax/isac.h
---- linux-2.4.29.old/drivers/isdn/hisax/isac.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isac.h	2005-03-22 15:06:47.111930680 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isac.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isac.h	2007-12-15 05:19:40.118707272 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isac.h	2007-12-15 05:19:55.591589021 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isac.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: isac.h,v 1.9 2001/09/24 13:22:56 kai Exp $
   *
   * ISAC specific defines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isar.c linux-2.4.29/drivers/isdn/hisax/isar.c
---- linux-2.4.29.old/drivers/isdn/hisax/isar.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isar.c	2005-03-22 15:06:47.302901648 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isar.c	2007-12-15 05:19:40.130707956 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isar.c	2007-12-15 05:19:55.595589250 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isar.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: isar.c,v 1.22 2001/09/23 12:00:05 keil Exp $
@@ -9892,9 +10004,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isar.c linux-2.4.29/drivers/isdn/h
  				default:
  					printk(KERN_DEBUG "HiSax: invalid ioctl %d\n",
  					       (int) ic->arg);
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isar.h linux-2.4.29/drivers/isdn/hisax/isar.h
---- linux-2.4.29.old/drivers/isdn/hisax/isar.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isar.h	2005-03-22 15:06:47.457878088 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isar.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isar.h	2007-12-15 05:19:40.138708412 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isar.h	2007-12-15 05:19:55.615590390 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isar.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: isar.h,v 1.11 2001/09/24 13:22:56 kai Exp $
@@ -9930,9 +10043,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isar.h linux-2.4.29/drivers/isdn/h
  extern int ISARVersion(struct IsdnCardState *cs, char *s);
  extern void isar_int_main(struct IsdnCardState *cs);
  extern void initisar(struct IsdnCardState *cs);
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl1.c linux-2.4.29/drivers/isdn/hisax/isdnl1.c
---- linux-2.4.29.old/drivers/isdn/hisax/isdnl1.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isdnl1.c	2005-03-22 15:06:47.582859088 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl1.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl1.c	2007-12-15 05:19:40.150709096 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isdnl1.c	2007-12-15 05:19:55.615590390 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdnl1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: isdnl1.c,v 2.46 2001/09/24 13:22:56 kai Exp $
@@ -9948,18 +10062,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl1.c linux-2.4.29/drivers/isdn
  
  #define __NO_VERSION__
  #include <linux/init.h>
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl1.h linux-2.4.29/drivers/isdn/hisax/isdnl1.h
---- linux-2.4.29.old/drivers/isdn/hisax/isdnl1.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isdnl1.h	2005-03-22 15:06:47.615854072 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl1.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl1.h	2007-12-15 05:19:40.154709325 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isdnl1.h	2007-12-15 05:19:55.619590620 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdnl1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: isdnl1.h,v 2.12 2001/09/24 13:22:56 kai Exp $
   *
   * Layer 1 defines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl2.c linux-2.4.29/drivers/isdn/hisax/isdnl2.c
---- linux-2.4.29.old/drivers/isdn/hisax/isdnl2.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isdnl2.c	2005-03-22 15:06:47.631851640 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl2.c	2007-12-15 05:19:40.162709781 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c	2007-12-15 05:19:55.619590620 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdnl2.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: isdnl2.c,v 2.30 2001/09/24 13:22:56 kai Exp $
@@ -9985,18 +10101,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl2.c linux-2.4.29/drivers/isdn
  }
  
  static void
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl2.h linux-2.4.29/drivers/isdn/hisax/isdnl2.h
---- linux-2.4.29.old/drivers/isdn/hisax/isdnl2.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isdnl2.h	2005-03-22 15:06:47.647849208 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl2.h	2007-12-15 05:19:40.170710236 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isdnl2.h	2007-12-15 05:19:55.619590620 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdnl2.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id$
   *
   * Layer 2 defines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl3.c linux-2.4.29/drivers/isdn/hisax/isdnl3.c
---- linux-2.4.29.old/drivers/isdn/hisax/isdnl3.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isdnl3.c	2005-03-22 15:06:47.663846776 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl3.c	2007-12-15 05:19:40.178710691 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isdnl3.c	2007-12-15 05:19:55.619590620 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdnl3.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: isdnl3.c,v 2.22 2001/09/24 13:22:56 kai Exp $
@@ -10012,18 +10130,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl3.c linux-2.4.29/drivers/isdn
  
  static struct Fsm l3fsm;
  
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl3.h linux-2.4.29/drivers/isdn/hisax/isdnl3.h
---- linux-2.4.29.old/drivers/isdn/hisax/isdnl3.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isdnl3.h	2005-03-22 15:06:47.679844344 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl3.h	2007-12-15 05:19:40.182710920 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isdnl3.h	2007-12-15 05:19:55.623590846 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdnl3.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id$
   *
   * This software may be used and distributed according to the terms
   * of the GNU General Public License, incorporated herein by reference.
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isurf.c linux-2.4.29/drivers/isdn/hisax/isurf.c
---- linux-2.4.29.old/drivers/isdn/hisax/isurf.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/isurf.c	2005-03-22 15:06:47.699841304 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/isurf.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/isurf.c	2007-12-15 05:19:40.190711376 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/isurf.c	2007-12-15 05:19:55.623590846 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isurf.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: isurf.c,v 1.12 2001/09/24 13:22:56 kai Exp $
@@ -10143,9 +10263,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isurf.c linux-2.4.29/drivers/isdn/
  	printk(KERN_INFO
  	       "ISurf: defined at 0x%x 0x%lx IRQ %d\n",
  	       cs->hw.isurf.reset,
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/ix1_micro.c linux-2.4.29/drivers/isdn/hisax/ix1_micro.c
---- linux-2.4.29.old/drivers/isdn/hisax/ix1_micro.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/ix1_micro.c	2005-03-22 15:06:47.714839024 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/ix1_micro.c	2007-12-15 05:19:40.198711831 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c	2007-12-15 05:19:55.623590846 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: ix1_micro.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: ix1_micro.c,v 2.12 2001/09/24 13:22:56 kai Exp $
@@ -10236,36 +10357,40 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/ix1_micro.c linux-2.4.29/drivers/i
  	/* IO-Ports */
  	cs->hw.ix1.isac_ale = card->para[1] + ISAC_COMMAND_OFFSET;
  	cs->hw.ix1.hscx_ale = card->para[1] + HSCX_COMMAND_OFFSET;
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/jade.c linux-2.4.29/drivers/isdn/hisax/jade.c
---- linux-2.4.29.old/drivers/isdn/hisax/jade.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/jade.c	2005-03-22 15:06:47.729836744 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/jade.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/jade.c	2007-12-15 05:19:40.206712289 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/jade.c	2007-12-15 05:19:55.623590846 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: jade.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: jade.c,v 1.9 2001/09/24 13:22:56 kai Exp $
   *
   * JADE stuff (derived from original hscx.c)
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/jade.h linux-2.4.29/drivers/isdn/hisax/jade.h
---- linux-2.4.29.old/drivers/isdn/hisax/jade.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/jade.h	2005-03-22 15:06:47.745834312 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/jade.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/jade.h	2007-12-15 05:19:40.214712745 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/jade.h	2007-12-15 05:19:55.623590846 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: jade.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: jade.h,v 1.5 2001/09/24 13:22:56 kai Exp $
   *
   * JADE specific defines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/jade_irq.c linux-2.4.29/drivers/isdn/hisax/jade_irq.c
---- linux-2.4.29.old/drivers/isdn/hisax/jade_irq.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/jade_irq.c	2005-03-22 15:06:47.760832032 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/jade_irq.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/jade_irq.c	2007-12-15 05:19:40.218712971 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/jade_irq.c	2007-12-15 05:19:55.627591072 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: jade_irq.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: jade_irq.c,v 1.7 2001/09/24 13:22:56 kai Exp $
   *
   * Low level JADE IRQ stuff (derived from original hscx_irq.c)
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3_1tr6.c linux-2.4.29/drivers/isdn/hisax/l3_1tr6.c
---- linux-2.4.29.old/drivers/isdn/hisax/l3_1tr6.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/l3_1tr6.c	2005-03-22 15:06:47.777829448 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3_1tr6.c	2007-12-15 05:19:40.226713429 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.c	2007-12-15 05:19:55.627591072 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: l3_1tr6.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: l3_1tr6.c,v 2.15 2001/09/24 13:22:56 kai Exp $
@@ -10281,18 +10406,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3_1tr6.c linux-2.4.29/drivers/isd
  
  #define MsgHead(ptr, cref, mty, dis) \
  	*ptr++ = dis; \
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3_1tr6.h linux-2.4.29/drivers/isdn/hisax/l3_1tr6.h
---- linux-2.4.29.old/drivers/isdn/hisax/l3_1tr6.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/l3_1tr6.h	2005-03-22 15:06:47.796826560 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3_1tr6.h	2007-12-15 05:19:40.234713885 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.h	2007-12-15 05:19:55.627591072 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: l3_1tr6.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id$
   *
   * German 1TR6 D-channel protocol defines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3dss1.c linux-2.4.29/drivers/isdn/hisax/l3dss1.c
---- linux-2.4.29.old/drivers/isdn/hisax/l3dss1.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/l3dss1.c	2005-03-22 15:06:47.822822608 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3dss1.c	2007-12-15 05:19:40.242714340 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/l3dss1.c	2007-12-15 05:19:55.635591530 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: l3dss1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: l3dss1.c,v 2.32 2001/09/24 13:22:56 kai Exp $
@@ -10308,18 +10435,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3dss1.c linux-2.4.29/drivers/isdn
  
  #define EXT_BEARER_CAPS 1
  
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3dss1.h linux-2.4.29/drivers/isdn/hisax/l3dss1.h
---- linux-2.4.29.old/drivers/isdn/hisax/l3dss1.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/l3dss1.h	2005-03-22 15:06:47.842819568 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3dss1.h	2007-12-15 05:19:40.250714795 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/l3dss1.h	2007-12-15 05:19:55.635591530 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: l3dss1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id$
   *
   * DSS1 (Euro) D-channel protocol defines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3ni1.c linux-2.4.29/drivers/isdn/hisax/l3ni1.c
---- linux-2.4.29.old/drivers/isdn/hisax/l3ni1.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/l3ni1.c	2005-03-22 15:06:47.859816984 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3ni1.c	2007-12-15 05:19:40.254715024 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/l3ni1.c	2007-12-15 05:19:55.635591530 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: l3ni1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: l3ni1.c,v 2.8 2001/09/24 13:22:56 kai Exp $
@@ -10335,27 +10464,30 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3ni1.c linux-2.4.29/drivers/isdn/
  
  #define EXT_BEARER_CAPS 1
  
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3ni1.h linux-2.4.29/drivers/isdn/hisax/l3ni1.h
---- linux-2.4.29.old/drivers/isdn/hisax/l3ni1.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/l3ni1.h	2005-03-22 15:06:47.877814248 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3ni1.h	2007-12-15 05:19:40.262715480 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/l3ni1.h	2007-12-15 05:19:55.635591530 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: l3ni1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id$
   *
   * NI1 D-channel protocol
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/lmgr.c linux-2.4.29/drivers/isdn/hisax/lmgr.c
---- linux-2.4.29.old/drivers/isdn/hisax/lmgr.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/lmgr.c	2005-03-22 15:06:47.895811512 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/lmgr.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/lmgr.c	2007-12-15 05:19:40.270715935 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/lmgr.c	2007-12-15 05:19:55.639591759 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: lmgr.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id$
   *
   * Layermanagement module
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/md5sums.asc linux-2.4.29/drivers/isdn/hisax/md5sums.asc
---- linux-2.4.29.old/drivers/isdn/hisax/md5sums.asc	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/md5sums.asc	2005-03-22 15:06:47.910809232 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/md5sums.asc	2007-12-15 05:19:40.278716390 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc	2007-12-15 05:19:55.639591759 +0100
 @@ -1,33 +1,22 @@
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
@@ -10406,9 +10538,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/md5sums.asc linux-2.4.29/drivers/i
 -GIKgAEdRLzERmpt/bCCwAbY=
 -=FaHw
 ------END PGP SIGNATURE-----
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/mic.c linux-2.4.29/drivers/isdn/hisax/mic.c
---- linux-2.4.29.old/drivers/isdn/hisax/mic.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/mic.c	2005-03-22 15:06:47.926806800 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/mic.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/mic.c	2007-12-15 05:19:40.282716619 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/mic.c	2007-12-15 05:19:55.639591759 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: mic.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: mic.c,v 1.12 2001/09/24 13:22:56 kai Exp $
@@ -10424,9 +10557,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/mic.c linux-2.4.29/drivers/isdn/hi
  
  #define byteout(addr,val) outb(val,addr)
  #define bytein(addr) inb(addr)
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/netjet.c linux-2.4.29/drivers/isdn/hisax/netjet.c
---- linux-2.4.29.old/drivers/isdn/hisax/netjet.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/netjet.c	2005-03-22 15:06:47.941804520 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/netjet.c	2007-12-15 05:19:40.290717075 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/netjet.c	2007-12-15 05:19:55.639591759 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: netjet.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: netjet.c,v 1.29 2001/09/24 13:22:56 kai Exp $
@@ -10506,18 +10640,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/netjet.c linux-2.4.29/drivers/isdn
  			l1_msg_b(st, pr, arg);
  			break;
  		case (PH_DEACTIVATE | CONFIRM):
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/netjet.h linux-2.4.29/drivers/isdn/hisax/netjet.h
---- linux-2.4.29.old/drivers/isdn/hisax/netjet.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/netjet.h	2005-03-22 15:06:47.956802240 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/netjet.h	2007-12-15 05:19:40.298717530 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/netjet.h	2007-12-15 05:19:55.639591759 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: netjet.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: netjet.h,v 2.8 2001/09/24 13:22:56 kai Exp $
   *
   * NETjet common header file
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/niccy.c linux-2.4.29/drivers/isdn/hisax/niccy.c
---- linux-2.4.29.old/drivers/isdn/hisax/niccy.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/niccy.c	2005-03-22 15:06:47.977799048 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/niccy.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/niccy.c	2007-12-15 05:19:40.306717988 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/niccy.c	2007-12-15 05:19:55.643591986 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: niccy.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: niccy.c,v 1.21 2001/10/20 22:05:00 kai Exp $
@@ -10603,9 +10739,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/niccy.c linux-2.4.29/drivers/isdn/
  			if (!pci_ioaddr) {
  				printk(KERN_WARNING "Niccy: No IO-Adr for PCI card found\n");
  				return(0);
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/nj_s.c linux-2.4.29/drivers/isdn/hisax/nj_s.c
---- linux-2.4.29.old/drivers/isdn/hisax/nj_s.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/nj_s.c	2005-03-22 15:06:47.993796616 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/nj_s.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/nj_s.c	2007-12-15 05:19:40.314718444 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/nj_s.c	2007-12-15 05:19:55.643591986 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: nj_s.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: nj_s.c,v 2.13 2001/09/24 13:22:56 kai Exp $
@@ -10663,9 +10800,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/nj_s.c linux-2.4.29/drivers/isdn/h
  	cs->readisac  = &NETjet_ReadIC;
  	cs->writeisac = &NETjet_WriteIC;
  	cs->readisacfifo  = &NETjet_ReadICfifo;
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/nj_u.c linux-2.4.29/drivers/isdn/hisax/nj_u.c
---- linux-2.4.29.old/drivers/isdn/hisax/nj_u.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/nj_u.c	2005-03-22 15:06:48.008794336 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/nj_u.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/nj_u.c	2007-12-15 05:19:40.318718670 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/nj_u.c	2007-12-15 05:19:55.643591986 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: nj_u.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ 
 +/* $Id: nj_u.c,v 2.14 2001/09/24 13:22:56 kai Exp $ 
@@ -10695,9 +10833,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/nj_u.c linux-2.4.29/drivers/isdn/h
  			if (!cs->hw.njet.base) {
  				printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n");
  				return(0);
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/q931.c linux-2.4.29/drivers/isdn/hisax/q931.c
---- linux-2.4.29.old/drivers/isdn/hisax/q931.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/q931.c	2005-03-22 15:06:48.032790688 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/q931.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/q931.c	2007-12-15 05:19:40.326719128 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/q931.c	2007-12-15 05:19:55.647592212 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: q931.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: q931.c,v 1.12 2001/09/24 13:22:56 kai Exp $
@@ -10736,9 +10875,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/q931.c linux-2.4.29/drivers/isdn/h
  
  static int
  prbits(char *dest, u_char b, int start, int len)
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/rawhdlc.c linux-2.4.29/drivers/isdn/hisax/rawhdlc.c
---- linux-2.4.29.old/drivers/isdn/hisax/rawhdlc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/rawhdlc.c	2005-03-22 15:06:48.047788408 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c	2007-12-15 05:19:55.647592212 +0100
 @@ -0,0 +1,543 @@
 +/* $Id: rawhdlc.c,v 1.7 2001/09/24 13:22:57 kai Exp $
 + *
@@ -11283,9 +11423,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/rawhdlc.c linux-2.4.29/drivers/isd
 +}
 +
 +#endif
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/rawhdlc.h linux-2.4.29/drivers/isdn/hisax/rawhdlc.h
---- linux-2.4.29.old/drivers/isdn/hisax/rawhdlc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/rawhdlc.h	2005-03-22 15:06:48.076784000 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.h	2007-12-15 05:19:55.647592212 +0100
 @@ -0,0 +1,28 @@
 +/* $Id: rawhdlc.h,v 1.5 2001/09/24 13:22:57 kai Exp $
 + *
@@ -11315,9 +11456,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/rawhdlc.h linux-2.4.29/drivers/isd
 +                       u_char *src, u_int slen, u_char *dst, u_int dsize);
 +#define RAWHDLC_H
 +#endif
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/s0box.c linux-2.4.29/drivers/isdn/hisax/s0box.c
---- linux-2.4.29.old/drivers/isdn/hisax/s0box.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/s0box.c	2005-03-22 15:06:48.092781568 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/s0box.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/s0box.c	2007-12-15 05:19:40.346720268 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/s0box.c	2007-12-15 05:19:55.647592212 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: s0box.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: s0box.c,v 2.6 2001/09/24 13:22:57 kai Exp $
@@ -11333,9 +11475,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/s0box.c linux-2.4.29/drivers/isdn/
  
  static inline void
  writereg(unsigned int padr, signed int addr, u_char off, u_char val) {
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/saphir.c linux-2.4.29/drivers/isdn/hisax/saphir.c
---- linux-2.4.29.old/drivers/isdn/hisax/saphir.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/saphir.c	2005-03-22 15:06:48.107779288 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/saphir.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/saphir.c	2007-12-15 05:19:40.350720494 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/saphir.c	2007-12-15 05:19:55.647592212 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: saphir.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: saphir.c,v 1.10 2001/09/24 13:22:57 kai Exp $
@@ -11351,9 +11494,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/saphir.c linux-2.4.29/drivers/isdn
  
  #define byteout(addr,val) outb(val,addr)
  #define bytein(addr) inb(addr)
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/sedlbauer.c linux-2.4.29/drivers/isdn/hisax/sedlbauer.c
---- linux-2.4.29.old/drivers/isdn/hisax/sedlbauer.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/sedlbauer.c	2005-03-22 15:06:48.123776856 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/sedlbauer.c	2007-12-15 05:19:40.358720950 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c	2007-12-15 05:19:55.651592441 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: sedlbauer.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: sedlbauer.c,v 1.34 2002/02/09 21:00:57 keil Exp $
@@ -11520,9 +11664,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/sedlbauer.c linux-2.4.29/drivers/i
  	/* In case of the sedlbauer pcmcia card, this region is in use,
  	 * reserved for us by the card manager. So we do not check it
  	 * here, it would fail.
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/sportster.c linux-2.4.29/drivers/isdn/hisax/sportster.c
---- linux-2.4.29.old/drivers/isdn/hisax/sportster.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/sportster.c	2005-03-22 15:06:48.169769864 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/sportster.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/sportster.c	2007-12-15 05:19:40.366721408 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/sportster.c	2007-12-15 05:19:55.651592441 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: sportster.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: sportster.c,v 1.16 2001/09/24 13:22:57 kai Exp $
@@ -11538,9 +11683,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/sportster.c linux-2.4.29/drivers/i
  
  #define byteout(addr,val) outb(val,addr)
  #define bytein(addr) inb(addr)
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481-debug.h linux-2.4.29/drivers/isdn/hisax/st5481-debug.h
---- linux-2.4.29.old/drivers/isdn/hisax/st5481-debug.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/st5481-debug.h	2005-03-22 15:06:48.184767584 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h	2007-12-15 05:19:55.651592441 +0100
 @@ -0,0 +1,103 @@
 +#define ST5481_DEBUG 0x0
 +
@@ -11645,9 +11791,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481-debug.h linux-2.4.29/driver
 +
 +
 +
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481.h linux-2.4.29/drivers/isdn/hisax/st5481.h
---- linux-2.4.29.old/drivers/isdn/hisax/st5481.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/st5481.h	2005-03-22 15:06:48.201765000 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481.h	2007-12-15 05:19:40.378722089 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/st5481.h	2007-12-15 05:19:55.651592441 +0100
 @@ -219,15 +219,15 @@
  #define L1_EVENT_COUNT (EV_TIMER3 + 1)
  
@@ -11747,9 +11894,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481.h linux-2.4.29/drivers/isdn
  {
  	int i,j;
  	int len,ofs;
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_b.c linux-2.4.29/drivers/isdn/hisax/st5481_b.c
---- linux-2.4.29.old/drivers/isdn/hisax/st5481_b.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/st5481_b.c	2005-03-22 15:06:48.216762720 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_b.c	2007-12-15 05:19:40.386722547 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c	2007-12-15 05:19:55.651592441 +0100
 @@ -67,28 +67,24 @@
  				bytes_sent = buf_size - len;
  				if (skb->len < bytes_sent)
@@ -11827,9 +11975,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_b.c linux-2.4.29/drivers/is
  {
  	DBG(4,"");
  
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_d.c linux-2.4.29/drivers/isdn/hisax/st5481_d.c
---- linux-2.4.29.old/drivers/isdn/hisax/st5481_d.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/st5481_d.c	2005-03-22 15:06:48.231760440 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_d.c	2007-12-15 05:19:40.394723003 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c	2007-12-15 05:19:55.655592670 +0100
 @@ -162,8 +162,8 @@
  	{ST_L1_F8, EV_TIMER3,            l1_timer3},
  	{ST_L1_F8, EV_IND_DP,            l1_go_f3},
@@ -11912,9 +12061,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_d.c linux-2.4.29/drivers/is
  {
  	DBG(2,"");
  
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_init.c linux-2.4.29/drivers/isdn/hisax/st5481_init.c
---- linux-2.4.29.old/drivers/isdn/hisax/st5481_init.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/st5481_init.c	2005-03-22 15:06:48.268754816 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_init.c	2007-12-15 05:19:40.398723229 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c	2007-12-15 05:19:55.655592670 +0100
 @@ -14,6 +14,7 @@
   * TODO:
   *
@@ -11932,9 +12082,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_init.c linux-2.4.29/drivers
  	id_table: st5481_ids,
  };
  
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_usb.c linux-2.4.29/drivers/isdn/hisax/st5481_usb.c
---- linux-2.4.29.old/drivers/isdn/hisax/st5481_usb.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/st5481_usb.c	2005-03-22 15:06:48.284752384 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_usb.c	2007-12-15 05:19:40.406723687 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c	2007-12-15 05:19:55.655592670 +0100
 @@ -41,9 +41,9 @@
  		(unsigned char *)&ctrl->msg_fifo.data[r_index];
  	
@@ -12077,9 +12228,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_usb.c linux-2.4.29/drivers/
  		st5481_usb_device_ctrl_msg(in->adapter, in->counter,
  					   in->packet_size,
  					   NULL, NULL);
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/tei.c linux-2.4.29/drivers/isdn/hisax/tei.c
---- linux-2.4.29.old/drivers/isdn/hisax/tei.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/tei.c	2005-03-22 15:06:48.316747520 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/tei.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/tei.c	2007-12-15 05:19:40.414724143 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/tei.c	2007-12-15 05:19:55.655592670 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: tei.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: tei.c,v 2.20 2001/09/24 13:22:57 kai Exp $
@@ -12095,9 +12247,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/tei.c linux-2.4.29/drivers/isdn/hi
  
  #define ID_REQUEST	1
  #define ID_ASSIGNED	2
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/teleint.c linux-2.4.29/drivers/isdn/hisax/teleint.c
---- linux-2.4.29.old/drivers/isdn/hisax/teleint.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/teleint.c	2005-03-22 15:06:48.330745392 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/teleint.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/teleint.c	2007-12-15 05:19:40.422724598 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/teleint.c	2007-12-15 05:19:55.659592899 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: teleint.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: teleint.c,v 1.16 2001/09/24 13:22:57 kai Exp $
@@ -12113,9 +12266,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/teleint.c linux-2.4.29/drivers/isd
  
  #define byteout(addr,val) outb(val,addr)
  #define bytein(addr) inb(addr)
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/teles0.c linux-2.4.29/drivers/isdn/hisax/teles0.c
---- linux-2.4.29.old/drivers/isdn/hisax/teles0.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/teles0.c	2005-03-22 15:06:48.348742656 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/teles0.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/teles0.c	2007-12-15 05:19:40.430725053 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/teles0.c	2007-12-15 05:19:55.659592899 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: teles0.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: teles0.c,v 2.15 2001/09/24 13:22:57 kai Exp $
@@ -12160,9 +12314,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/teles0.c linux-2.4.29/drivers/isdn
  	printk(KERN_INFO
  	       "HiSax: %s config irq:%d mem:0x%lX cfg:0x%X\n",
  	       CardType[cs->typ], cs->irq,
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/teles3.c linux-2.4.29/drivers/isdn/hisax/teles3.c
---- linux-2.4.29.old/drivers/isdn/hisax/teles3.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/teles3.c	2005-03-22 15:06:48.367739768 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/teles3.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/teles3.c	2007-12-15 05:19:40.434725282 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/teles3.c	2007-12-15 05:19:55.659592899 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: teles3.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: teles3.c,v 2.19 2001/09/24 13:22:57 kai Exp $
@@ -12258,9 +12413,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/teles3.c linux-2.4.29/drivers/isdn
  	if (cs->typ == ISDN_CTYPE_16_3) {
  		cs->hw.teles3.cfg_reg = card->para[1];
  		switch (cs->hw.teles3.cfg_reg) {
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/telespci.c linux-2.4.29/drivers/isdn/hisax/telespci.c
---- linux-2.4.29.old/drivers/isdn/hisax/telespci.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/telespci.c	2005-03-22 15:06:48.382737488 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/telespci.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/telespci.c	2007-12-15 05:19:40.442725738 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/telespci.c	2007-12-15 05:19:55.659592899 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: telespci.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: telespci.c,v 2.23 2001/09/24 13:22:57 kai Exp $
@@ -12292,9 +12448,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/telespci.c linux-2.4.29/drivers/is
  	} else {
  		printk(KERN_WARNING "TelesPCI: No PCI card found\n");
  		return(0);
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/w6692.c linux-2.4.29/drivers/isdn/hisax/w6692.c
---- linux-2.4.29.old/drivers/isdn/hisax/w6692.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/w6692.c	2005-03-22 15:06:48.398735056 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/w6692.c	2007-12-15 05:19:40.450726193 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/w6692.c	2007-12-15 05:19:55.659592899 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: w6692.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: w6692.c,v 1.18 2001/09/24 13:22:57 kai Exp $
@@ -12476,18 +12633,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hisax/w6692.c linux-2.4.29/drivers/isdn/
  	       cs->hw.w6692.iobase);
  
  	cs->readW6692 = &ReadW6692;
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/w6692.h linux-2.4.29/drivers/isdn/hisax/w6692.h
---- linux-2.4.29.old/drivers/isdn/hisax/w6692.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/w6692.h	2005-03-22 15:06:48.414732624 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/w6692.h	2007-12-15 05:19:40.458726649 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/w6692.h	2007-12-15 05:19:55.663593126 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: w6692.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
 +/* $Id: w6692.h,v 1.4 2001/09/24 13:22:57 kai Exp $
   *
   * Winbond W6692 specific defines
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/boardergo.c linux-2.4.29/drivers/isdn/hysdn/boardergo.c
---- linux-2.4.29.old/drivers/isdn/hysdn/boardergo.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/boardergo.c	2005-03-22 15:06:48.468724416 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/boardergo.c	2007-12-15 05:19:40.466727107 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c	2007-12-15 05:19:55.667593352 +0100
 @@ -1,27 +1,41 @@
 -/* $Id: boardergo.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 - *
@@ -12691,9 +12850,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/boardergo.c linux-2.4.29/drivers/i
  		set_current_state(TASK_INTERRUPTIBLE);
  		schedule_timeout((50 * HZ) / 1000);	/* Timeout 50ms */
  	}			/* wait until timeout */
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/boardergo.h linux-2.4.29/drivers/isdn/hysdn/boardergo.h
---- linux-2.4.29.old/drivers/isdn/hysdn/boardergo.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/boardergo.h	2005-03-22 15:06:48.485721832 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/boardergo.h	2007-12-15 05:19:40.470727333 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/boardergo.h	2007-12-15 05:19:55.667593352 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: boardergo.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
@@ -12708,9 +12868,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/boardergo.h linux-2.4.29/drivers/i
  
  /************************************************/
  /* defines for the dual port memory of the card */
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hycapi.c linux-2.4.29/drivers/isdn/hysdn/hycapi.c
---- linux-2.4.29.old/drivers/isdn/hysdn/hycapi.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/hycapi.c	2005-03-22 15:06:48.500719552 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/hycapi.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hycapi.c	2007-12-15 05:19:40.478727788 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/hycapi.c	2007-12-15 05:19:55.671593581 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hycapi.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
@@ -12726,9 +12887,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hycapi.c linux-2.4.29/drivers/isdn
  
  unsigned int hycapi_enable = 0xffffffff; 
  MODULE_PARM(hycapi_enable, "i");
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_boot.c linux-2.4.29/drivers/isdn/hysdn/hysdn_boot.c
---- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_boot.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/hysdn_boot.c	2005-03-22 15:06:48.516717120 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_boot.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_boot.c	2007-12-15 05:19:40.486728246 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_boot.c	2007-12-15 05:19:55.671593581 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hysdn_boot.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
@@ -12744,9 +12906,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_boot.c linux-2.4.29/drivers/
  				return (boot->last_error);	/* error writing data */
  
  			if (boot->pof_recoffset + datlen >= boot->pof_reclen)
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_defs.h linux-2.4.29/drivers/isdn/hysdn/hysdn_defs.h
---- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_defs.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/hysdn_defs.h	2005-03-22 15:06:48.533714536 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_defs.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_defs.h	2007-12-15 05:19:40.494728702 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_defs.h	2007-12-15 05:19:55.671593581 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hysdn_defs.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id: hysdn_defs.h,v 1.10 2001/09/24 13:23:03 kai Exp $
@@ -12773,9 +12936,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_defs.h linux-2.4.29/drivers/
  
  	/* boot process */
  	void *boot;		/* pointer to boot private data */
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_init.c linux-2.4.29/drivers/isdn/hysdn/hysdn_init.c
---- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_init.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/hysdn_init.c	2005-03-22 15:06:48.551711800 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_init.c	2007-12-15 05:19:40.502729157 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c	2007-12-15 05:19:55.671593581 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hysdn_init.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
@@ -12820,9 +12984,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_init.c linux-2.4.29/drivers/
  		card->brdtype = BD_NONE;	/* unknown */
  		card->debug_flags = DEF_DEB_FLAGS;	/* set default debug */
  		card->faxchans = 0;	/* default no fax channels */
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_net.c linux-2.4.29/drivers/isdn/hysdn/hysdn_net.c
---- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_net.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/hysdn_net.c	2005-03-22 15:06:48.567709368 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_net.c	2007-12-15 05:19:40.506729386 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c	2007-12-15 05:19:55.675593810 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hysdn_net.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
@@ -13042,18 +13207,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_net.c linux-2.4.29/drivers/i
  
  	unregister_netdev(dev);	/* release the device */
  	kfree(dev);		/* release the memory allocated */
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_pof.h linux-2.4.29/drivers/isdn/hysdn/hysdn_pof.h
---- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_pof.h	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/hysdn_pof.h	2005-03-22 15:06:48.583706936 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_pof.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_pof.h	2007-12-15 05:19:40.514729842 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_pof.h	2007-12-15 05:19:55.675593810 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hysdn_pof.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Linux driver for HYSDN cards, definitions used for handling pof-files.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_procconf.c linux-2.4.29/drivers/isdn/hysdn/hysdn_procconf.c
---- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_procconf.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/hysdn_procconf.c	2005-03-22 15:06:48.598704656 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_procconf.c	2007-12-15 05:19:40.522730297 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c	2007-12-15 05:19:55.675593810 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hysdn_procconf.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
@@ -13250,9 +13417,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_procconf.c linux-2.4.29/driv
  			hysdn_proclog_init(card);	/* init the log file entry */
  		}
  		card = card->next;	/* next entry */
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_proclog.c linux-2.4.29/drivers/isdn/hysdn/hysdn_proclog.c
---- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_proclog.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/hysdn_proclog.c	2005-03-22 15:06:48.613702376 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_proclog.c	2007-12-15 05:19:40.530730752 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c	2007-12-15 05:19:55.675593810 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hysdn_proclog.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
@@ -13436,9 +13604,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_proclog.c linux-2.4.29/drive
  		}
  
  		init_waitqueue_head(&(pd->rd_queue));
-diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_sched.c linux-2.4.29/drivers/isdn/hysdn/hysdn_sched.c
---- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_sched.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/hysdn/hysdn_sched.c	2005-03-22 15:06:48.630699792 +0100
+Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_sched.c	2007-12-15 05:19:40.538731208 +0100
++++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c	2007-12-15 05:19:55.679594039 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hysdn_sched.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id: hysdn_sched.c,v 1.9 2001/09/24 13:23:03 kai Exp $
@@ -13522,9 +13691,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_sched.c linux-2.4.29/drivers
  	if (card->debug_flags & LOG_SCHED_ASYN)
  		hysdn_addlog(card, "async tx-cfg data send");
  
-diff -rNu linux-2.4.29.old/drivers/isdn/icn/icn.c linux-2.4.29/drivers/isdn/icn/icn.c
---- linux-2.4.29.old/drivers/isdn/icn/icn.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/icn/icn.c	2005-03-22 15:06:48.722685808 +0100
+Index: linux-2.4.35.4/drivers/isdn/icn/icn.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/icn/icn.c	2007-12-15 05:19:40.546731666 +0100
++++ linux-2.4.35.4/drivers/isdn/icn/icn.c	2007-12-15 05:19:55.679594039 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: icn.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
@@ -13577,18 +13747,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/icn/icn.c linux-2.4.29/drivers/isdn/icn/
  #endif /* MODULE */
  
  static int __init icn_init(void)
-diff -rNu linux-2.4.29.old/drivers/isdn/icn/icn.h linux-2.4.29/drivers/isdn/icn/icn.h
---- linux-2.4.29.old/drivers/isdn/icn/icn.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/icn/icn.h	2005-03-22 15:06:48.752681248 +0100
+Index: linux-2.4.35.4/drivers/isdn/icn/icn.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/icn/icn.h	2007-12-15 05:19:40.554732121 +0100
++++ linux-2.4.35.4/drivers/isdn/icn/icn.h	2007-12-15 05:19:55.679594039 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: icn.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * ISDN lowlevel-module for the ICN active ISDN-Card.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_audio.c linux-2.4.29/drivers/isdn/isdn_audio.c
---- linux-2.4.29.old/drivers/isdn/isdn_audio.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_audio.c	2005-03-22 15:06:44.306357192 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_audio.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_audio.c	2007-12-15 05:19:40.562732576 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_audio.c	2007-12-15 05:19:55.679594039 +0100
 @@ -1,9 +1,9 @@
 -/* $Id: isdn_audio.c,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
 +/* $Id: isdn_audio.c,v 1.24 2002/08/13 09:57:26 keil Exp $
@@ -13753,9 +13925,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_audio.c linux-2.4.29/drivers/isdn/i
  				what = '.';
  		}
  		if ((what != s->last) && (what != ' ') && (what != '.')) {
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_audio.h linux-2.4.29/drivers/isdn/isdn_audio.h
---- linux-2.4.29.old/drivers/isdn/isdn_audio.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_audio.h	2005-03-22 15:06:44.321354912 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_audio.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_audio.h	2007-12-15 05:19:40.566732806 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_audio.h	2007-12-15 05:19:55.683594266 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_audio.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_audio.h,v 1.10 2001/09/24 13:22:42 kai Exp $
@@ -13770,9 +13943,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_audio.h linux-2.4.29/drivers/isdn/i
  	int idx;
  	int buf[DTMF_NPOINTS];
  } dtmf_state;
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_bsdcomp.c linux-2.4.29/drivers/isdn/isdn_bsdcomp.c
---- linux-2.4.29.old/drivers/isdn/isdn_bsdcomp.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_bsdcomp.c	2005-03-22 15:06:44.339352176 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_bsdcomp.c	2007-12-15 05:19:40.574733261 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c	2007-12-15 05:19:55.683594266 +0100
 @@ -105,6 +105,14 @@
  
  #define DEBUG 1
@@ -14013,9 +14187,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_bsdcomp.c linux-2.4.29/drivers/isdn
  	return skb_out->len;
  }
  
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/isdn_common.c
---- linux-2.4.29.old/drivers/isdn/isdn_common.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_common.c	2005-03-22 15:06:44.359349136 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_common.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_common.c	2007-12-15 05:19:40.582733716 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_common.c	2007-12-15 05:19:55.687594492 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_common.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_common.c,v 1.137 2002/02/09 21:19:11 keil Exp $
@@ -14463,7 +14638,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		if (dev->drv[drvidx]->interface->readstat) {
  			if (count > dev->drv[drvidx]->stavail)
  				count = dev->drv[drvidx]->stavail;
-@@ -1061,6 +1216,9 @@
+@@ -1065,6 +1220,9 @@
  		} else {
  			len = 0;
  		}
@@ -14473,7 +14648,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		save_flags(flags);
  		cli();
  		if (len)
-@@ -1068,7 +1226,7 @@
+@@ -1072,7 +1230,7 @@
  		else
  			dev->drv[drvidx]->stavail = 0;
  		restore_flags(flags);
@@ -14482,7 +14657,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		retval = len;
  		goto out;
  	}
-@@ -1080,7 +1238,9 @@
+@@ -1084,7 +1242,9 @@
  #endif
  	retval = -ENODEV;
   out:
@@ -14492,7 +14667,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	return retval;
  }
  
-@@ -1092,15 +1252,18 @@
+@@ -1096,15 +1256,18 @@
  	int chidx;
  	int retval;
  
@@ -14513,7 +14688,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	if (minor <= ISDN_MINOR_BMAX) {
  		printk(KERN_WARNING "isdn_write minor %d obsolete!\n", minor);
  		drvidx = isdn_minor2drv(minor);
-@@ -1145,7 +1308,9 @@
+@@ -1149,7 +1312,9 @@
  #endif
  	retval = -ENODEV;
   out:
@@ -14523,7 +14698,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	return retval;
  }
  
-@@ -1156,15 +1321,12 @@
+@@ -1160,15 +1325,12 @@
  	unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
  	int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
  
@@ -14544,7 +14719,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	if (minor >= ISDN_MINOR_CTRL && minor <= ISDN_MINOR_CTRLMAX) {
  		if (drvidx < 0) {
  			/* driver deregistered while file open */
-@@ -1186,7 +1348,9 @@
+@@ -1190,7 +1352,9 @@
  #endif
  	mask = POLLERR;
   out:
@@ -14554,7 +14729,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	return mask;
  }
  
-@@ -1216,42 +1380,9 @@
+@@ -1220,42 +1384,9 @@
  #define phone iocpar.phone
  #define cfg   iocpar.cfg
  
@@ -14600,7 +14775,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	if (!dev->drivers)
  		return -ENODEV;
  	if (minor <= ISDN_MINOR_BMAX) {
-@@ -1273,11 +1404,34 @@
+@@ -1277,11 +1408,34 @@
   */
  		switch (cmd) {
  			case IIOCNETDWRSET:
@@ -14635,7 +14810,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  #ifdef CONFIG_NETDEVICES
  			case IIOCNETAIF:
  				/* Add a network-interface */
-@@ -1650,22 +1804,12 @@
+@@ -1654,22 +1808,12 @@
  	int chidx;
  	int retval = -ENODEV;
  
@@ -14662,7 +14837,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	}
  	if (!dev->channels)
  		goto out;
-@@ -1688,6 +1832,9 @@
+@@ -1692,6 +1836,9 @@
  		if (drvidx < 0)
  			goto out;
  		isdn_lock_drivers();
@@ -14672,7 +14847,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		retval = 0;
  		goto out;
  	}
-@@ -1700,6 +1847,10 @@
+@@ -1704,6 +1851,10 @@
  	}
  #endif
   out:
@@ -14683,7 +14858,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	return retval;
  }
  
-@@ -1708,25 +1859,11 @@
+@@ -1712,25 +1863,11 @@
  {
  	uint minor = MINOR(ino->i_rdev);
  
@@ -14712,7 +14887,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	}
  	isdn_unlock_drivers();
  	if (minor <= ISDN_MINOR_BMAX)
-@@ -1734,6 +1871,12 @@
+@@ -1738,6 +1875,12 @@
  	if (minor <= ISDN_MINOR_CTRLMAX) {
  		if (dev->profd == current)
  			dev->profd = NULL;
@@ -14725,7 +14900,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		goto out;
  	}
  #ifdef CONFIG_ISDN_PPP
-@@ -1742,13 +1885,19 @@
+@@ -1746,13 +1889,19 @@
  #endif
  
   out:
@@ -14745,7 +14920,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	llseek:		no_llseek,
  	read:		isdn_read,
  	write:		isdn_write,
-@@ -1801,6 +1950,15 @@
+@@ -1805,6 +1954,15 @@
  		if (USG_NONE(dev->usage[i]) &&
  		    (dev->drvmap[i] != -1)) {
  			int d = dev->drvmap[i];
@@ -14761,7 +14936,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  			if ((dev->usage[i] & ISDN_USAGE_EXCLUSIVE) &&
  			((pre_dev != d) || (pre_chan != dev->chanmap[i])))
  				continue;
-@@ -1819,7 +1977,11 @@
+@@ -1823,7 +1981,11 @@
  						restore_flags(flags);
  						return i;
  					} else {
@@ -14773,7 +14948,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  							dev->usage[i] &= ISDN_USAGE_EXCLUSIVE;
  							dev->usage[i] |= usage;
  							isdn_info_update();
-@@ -2006,7 +2168,7 @@
+@@ -2010,7 +2172,7 @@
  
  	if ((adding) && (d->rcverr))
  		kfree(d->rcverr);
@@ -14782,7 +14957,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		printk(KERN_WARNING "register_isdn: Could not alloc rcverr\n");
  		return -1;
  	}
-@@ -2014,7 +2176,7 @@
+@@ -2018,7 +2180,7 @@
  
  	if ((adding) && (d->rcvcount))
  		kfree(d->rcvcount);
@@ -14791,7 +14966,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n");
  		if (!adding) kfree(d->rcverr);
  		return -1;
-@@ -2026,7 +2188,8 @@
+@@ -2030,7 +2192,8 @@
  			skb_queue_purge(&d->rpqueue[j]);
  		kfree(d->rpqueue);
  	}
@@ -14801,7 +14976,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		printk(KERN_WARNING "register_isdn: Could not alloc rpqueue\n");
  		if (!adding) {
  			kfree(d->rcvcount);
-@@ -2040,7 +2203,8 @@
+@@ -2044,7 +2207,8 @@
  
  	if ((adding) && (d->rcv_waitq))
  		kfree(d->rcv_waitq);
@@ -14811,7 +14986,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	if (!d->rcv_waitq) {
  		printk(KERN_WARNING "register_isdn: Could not alloc rcv_waitq\n");
  		if (!adding) {
-@@ -2064,7 +2228,9 @@
+@@ -2068,7 +2232,9 @@
  			if (dev->chanmap[k] < 0) {
  				dev->chanmap[k] = j;
  				dev->drvmap[k] = drvidx;
@@ -14821,7 +14996,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  				break;
  			}
  	restore_flags(flags);
-@@ -2128,6 +2294,7 @@
+@@ -2132,6 +2298,7 @@
          i_div->ll_cmd = isdn_command; /* set command function */
          i_div->drv_to_name = map_drvname; 
          i_div->name_to_drv = map_namedrv; 
@@ -14829,7 +15004,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
          MOD_INC_USE_COUNT;
          divert_if = i_div; /* remember interface */
          return(DIVERT_NO_ERR);
-@@ -2165,7 +2332,7 @@
+@@ -2169,7 +2336,7 @@
  		printk(KERN_WARNING "register_isdn: No write routine given.\n");
  		return 0;
  	}
@@ -14838,7 +15013,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		printk(KERN_WARNING "register_isdn: Could not alloc driver-struct\n");
  		return 0;
  	}
-@@ -2225,6 +2392,7 @@
+@@ -2229,6 +2396,7 @@
  	return rev;
  }
  
@@ -14846,7 +15021,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  #ifdef CONFIG_DEVFS_FS
  
  static devfs_handle_t devfs_handle;
-@@ -2314,6 +2482,7 @@
+@@ -2318,6 +2486,7 @@
  }
  
  #endif  /* CONFIG_DEVFS_FS */
@@ -14854,7 +15029,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  
  /*
   * Allocate and initialize all data, register modem-devices
-@@ -2331,7 +2500,6 @@
+@@ -2335,7 +2504,6 @@
  	init_timer(&dev->timer);
  	dev->timer.function = isdn_timer_funct;
  	init_MUTEX(&dev->sem);
@@ -14862,7 +15037,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
  		dev->drvmap[i] = -1;
  		dev->chanmap[i] = -1;
-@@ -2345,7 +2513,9 @@
+@@ -2349,7 +2517,9 @@
  		vfree(dev);
  		return -EIO;
  	}
@@ -14872,7 +15047,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	if ((i = isdn_tty_modem_init()) < 0) {
  		printk(KERN_WARNING "isdn: Could not register tty devices\n");
  		if (i == -3)
-@@ -2353,7 +2523,9 @@
+@@ -2357,7 +2527,9 @@
  		if (i <= -2)
  			tty_unregister_driver(&dev->mdm.tty_modem);
  		vfree(dev);
@@ -14882,7 +15057,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		devfs_unregister_chrdev(ISDN_MAJOR, "isdn");
  		return -EIO;
  	}
-@@ -2364,7 +2536,9 @@
+@@ -2368,7 +2540,9 @@
  		tty_unregister_driver(&dev->mdm.cua_modem);
  		for (i = 0; i < ISDN_MAX_CHANNELS; i++)
  			kfree(dev->mdm.info[i].xmit_buf - 4);
@@ -14892,7 +15067,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  		devfs_unregister_chrdev(ISDN_MAJOR, "isdn");
  		vfree(dev);
  		return -EIO;
-@@ -2390,6 +2564,9 @@
+@@ -2394,6 +2568,9 @@
  	printk("\n");
  #endif
  	isdn_info_update();
@@ -14902,7 +15077,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	return 0;
  }
  
-@@ -2398,7 +2575,7 @@
+@@ -2402,7 +2579,7 @@
   */
  static void __exit isdn_exit(void)
  {
@@ -14911,7 +15086,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  	int i;
  
  #ifdef CONFIG_ISDN_PPP
-@@ -2432,13 +2609,18 @@
+@@ -2436,13 +2613,18 @@
  		printk(KERN_WARNING "isdn: controldevice busy, remove cancelled\n");
  		restore_flags(flags);
  	} else {
@@ -14930,9 +15105,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/
  }
  
  module_init(isdn_init);
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.h linux-2.4.29/drivers/isdn/isdn_common.h
---- linux-2.4.29.old/drivers/isdn/isdn_common.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_common.h	2005-03-22 15:06:44.374346856 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_common.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_common.h	2007-12-15 05:19:40.590734172 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_common.h	2007-12-15 05:19:55.687594492 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_common.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_common.h,v 1.22 2001/09/24 13:22:42 kai Exp $
@@ -14949,27 +15125,30 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.h linux-2.4.29/drivers/isdn/
  /* Prototypes */
  extern void isdn_MOD_INC_USE_COUNT(void);
  extern void isdn_MOD_DEC_USE_COUNT(void);
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_concap.c linux-2.4.29/drivers/isdn/isdn_concap.c
---- linux-2.4.29.old/drivers/isdn/isdn_concap.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_concap.c	2005-03-22 15:06:44.389344576 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_concap.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_concap.c	2007-12-15 05:19:40.598734627 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_concap.c	2007-12-15 05:19:55.687594492 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_concap.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_concap.c,v 1.9 2001/09/24 13:22:42 kai Exp $
   * 
   * Linux ISDN subsystem, protocol encapsulation
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_concap.h linux-2.4.29/drivers/isdn/isdn_concap.h
---- linux-2.4.29.old/drivers/isdn/isdn_concap.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_concap.h	2005-03-22 15:06:44.405342144 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_concap.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_concap.h	2007-12-15 05:19:40.606735085 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_concap.h	2007-12-15 05:19:55.687594492 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_concap.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_concap.h,v 1.4 2001/09/24 13:22:42 kai Exp $
   *
   * Linux ISDN subsystem, protocol encapsulation
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_dwabc.c linux-2.4.29/drivers/isdn/isdn_dwabc.c
---- linux-2.4.29.old/drivers/isdn/isdn_dwabc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_dwabc.c	2005-03-22 15:06:44.421339712 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_dwabc.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/isdn/isdn_dwabc.c	2007-12-15 05:19:55.695594949 +0100
 @@ -0,0 +1,1053 @@
 +
 +/* $Id: isdn_dwabc.c,v 1.27 2001/12/01 23:18:21 detabc Exp $
@@ -16024,9 +16203,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_dwabc.c linux-2.4.29/drivers/isdn/i
 +{ return(skb); }
 +#endif
 +#endif
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_net.c linux-2.4.29/drivers/isdn/isdn_net.c
---- linux-2.4.29.old/drivers/isdn/isdn_net.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_net.c	2005-03-22 15:06:44.447335760 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_net.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_net.c	2007-12-15 05:19:40.618735767 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_net.c	2007-12-15 05:19:55.699595179 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_net.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_net.c,v 1.153 2002/08/17 18:35:23 detabc Exp $
@@ -17619,9 +17799,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_net.c linux-2.4.29/drivers/isdn/isd
  	restore_flags(flags);
  	kfree(p->local);
  	kfree(p);
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_net.h linux-2.4.29/drivers/isdn/isdn_net.h
---- linux-2.4.29.old/drivers/isdn/isdn_net.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_net.h	2005-03-22 15:06:44.463333328 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_net.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_net.h	2007-12-15 05:19:40.626736225 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_net.h	2007-12-15 05:19:55.699595179 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_net.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_net.h,v 1.23 2001/11/07 22:35:48 kai Exp $
@@ -17667,9 +17848,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_net.h linux-2.4.29/drivers/isdn/isd
  	spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags);
  }
  
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.c linux-2.4.29/drivers/isdn/isdn_ppp.c
---- linux-2.4.29.old/drivers/isdn/isdn_ppp.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_ppp.c	2005-03-22 15:06:44.481330592 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_ppp.c	2007-12-15 05:19:40.634736680 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_ppp.c	2007-12-15 05:19:55.703595405 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_ppp.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_ppp.c,v 1.94 2001/11/07 22:35:48 kai Exp $
@@ -18244,7 +18426,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.c linux-2.4.29/drivers/isdn/isd
  
  	if (lp->p_encap != ISDN_NET_ENCAP_SYNCPPP)
  		return -EINVAL;
-@@ -2431,7 +2249,7 @@
+@@ -2432,7 +2250,7 @@
  				return;
  			}
  			rs->state = CCPResetSentReq;
@@ -18253,7 +18435,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.c linux-2.4.29/drivers/isdn/isd
  			   know	better */
  			rs->expra = 1;
  			rs->dlen = 0;
-@@ -2582,7 +2400,13 @@
+@@ -2583,7 +2401,13 @@
      }
  
  	if(type) { /* type=1 => Link compression */
@@ -18267,7 +18449,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.c linux-2.4.29/drivers/isdn/isd
  	}
  	else {
  		if(!master) {
-@@ -2630,31 +2454,18 @@
+@@ -2631,31 +2455,18 @@
  static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
  	 struct sk_buff *skb,int proto)
  {
@@ -18304,7 +18486,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.c linux-2.4.29/drivers/isdn/isd
  		mis = is;
  
  	switch(skb->data[0]) {
-@@ -2806,18 +2617,13 @@
+@@ -2807,18 +2618,13 @@
  
  static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct sk_buff *skb)
  {
@@ -18326,7 +18508,7 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.c linux-2.4.29/drivers/isdn/isd
  	/* Daemon may send with or without address and control field comp */
  	data = skb->data;
  	if(!(is->pppcfg & SC_COMP_AC) && data[0] == 0xff && data[1] == 0x03) {
-@@ -2833,17 +2639,12 @@
+@@ -2834,17 +2640,12 @@
  	printk(KERN_DEBUG "Received CCP frame from daemon:\n");
  	isdn_ppp_frame_log("ccp-xmit", skb->data, skb->len, 32, is->unit,lp->ppp_slot);
  
@@ -18350,9 +18532,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.c linux-2.4.29/drivers/isdn/isd
  		printk(KERN_DEBUG "isdn_ppp: Ouch! Master CCP sends on slave slot!\n");
  	
          switch(data[2]) {
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.h linux-2.4.29/drivers/isdn/isdn_ppp.h
---- linux-2.4.29.old/drivers/isdn/isdn_ppp.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_ppp.h	2005-03-22 15:06:44.497328160 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_ppp.h	2007-12-15 05:19:40.642737136 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_ppp.h	2007-12-15 05:19:55.703595405 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_ppp.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_ppp.h,v 1.18 2001/09/24 13:22:42 kai Exp $
@@ -18367,9 +18550,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.h linux-2.4.29/drivers/isdn/isd
  extern int isdn_ppp_xmit(struct sk_buff *, struct net_device *);
  extern void isdn_ppp_receive(isdn_net_dev *, isdn_net_local *, struct sk_buff *);
  extern int isdn_ppp_dev_ioctl(struct net_device *, struct ifreq *, int);
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_tty.c linux-2.4.29/drivers/isdn/isdn_tty.c
---- linux-2.4.29.old/drivers/isdn/isdn_tty.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_tty.c	2005-03-22 15:06:44.524324056 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_tty.c	2007-12-15 05:19:40.646737365 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_tty.c	2007-12-15 05:19:55.703595405 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_tty.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_tty.c,v 1.104 2002/02/09 21:19:11 keil Exp $
@@ -18529,9 +18713,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_tty.c linux-2.4.29/drivers/isdn/isd
  						if (dev->global_features &
  							ISDN_FEATURE_L3_FCLASS2)
  							strcat(rs, "2,");
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_tty.h linux-2.4.29/drivers/isdn/isdn_tty.h
---- linux-2.4.29.old/drivers/isdn/isdn_tty.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_tty.h	2005-03-22 15:06:44.545320864 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_tty.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_tty.h	2007-12-15 05:19:40.654737820 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_tty.h	2007-12-15 05:19:55.707595631 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_tty.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_tty.h,v 1.25 2002/02/09 21:19:11 keil Exp $
@@ -18563,9 +18748,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_tty.h linux-2.4.29/drivers/isdn/isd
  #define TTY_IS_FCLASS2(info) \
  	((info->emu.mdmreg[REG_L2PROT] == ISDN_PROTO_L2_FAX) && \
  	 (info->emu.mdmreg[REG_L3PROT] == ISDN_PROTO_L3_FCLASS2))
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ttyfax.c linux-2.4.29/drivers/isdn/isdn_ttyfax.c
---- linux-2.4.29.old/drivers/isdn/isdn_ttyfax.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_ttyfax.c	2005-03-22 15:06:44.561318432 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_ttyfax.c	2007-12-15 05:19:40.662738275 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c	2007-12-15 05:19:55.711595860 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_ttyfax.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_ttyfax.c,v 1.9 2001/09/24 13:22:43 kai Exp $
@@ -18783,18 +18969,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ttyfax.c linux-2.4.29/drivers/isdn/
 +#endif
  	PARSE_ERROR1;
  }
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ttyfax.h linux-2.4.29/drivers/isdn/isdn_ttyfax.h
---- linux-2.4.29.old/drivers/isdn/isdn_ttyfax.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_ttyfax.h	2005-03-22 15:06:44.576316152 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_ttyfax.h	2007-12-15 05:19:40.670738731 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_ttyfax.h	2007-12-15 05:19:55.711595860 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_ttyfax.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_ttyfax.h,v 1.3 2001/09/24 13:22:43 kai Exp $
   *
   * header for Linux ISDN subsystem, tty_fax related functions (linklevel).
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_v110.c linux-2.4.29/drivers/isdn/isdn_v110.c
---- linux-2.4.29.old/drivers/isdn/isdn_v110.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_v110.c	2005-03-22 15:06:44.593313568 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_v110.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_v110.c	2007-12-15 05:19:40.678739186 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_v110.c	2007-12-15 05:19:55.711595860 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_v110.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_v110.c,v 1.8 2001/09/24 13:22:43 kai Exp $
@@ -18825,36 +19013,40 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdn_v110.c linux-2.4.29/drivers/isdn/is
  #endif
  	kfree(v->encodebuf);
  	kfree(v);
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_v110.h linux-2.4.29/drivers/isdn/isdn_v110.h
---- linux-2.4.29.old/drivers/isdn/isdn_v110.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_v110.h	2005-03-22 15:06:44.608311288 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_v110.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_v110.h	2007-12-15 05:19:40.686739644 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_v110.h	2007-12-15 05:19:55.715596089 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_v110.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_v110.h,v 1.5 2001/09/24 13:22:43 kai Exp $
   *
   * Linux ISDN subsystem, V.110 related functions (linklevel).
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_x25iface.c linux-2.4.29/drivers/isdn/isdn_x25iface.c
---- linux-2.4.29.old/drivers/isdn/isdn_x25iface.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_x25iface.c	2005-03-22 15:06:44.626308552 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_x25iface.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_x25iface.c	2007-12-15 05:19:40.694740100 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_x25iface.c	2007-12-15 05:19:55.715596089 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_x25iface.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_x25iface.c,v 1.10 2001/09/24 13:22:43 kai Exp $
   *
   * Linux ISDN subsystem, X.25 related functions
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/isdn_x25iface.h linux-2.4.29/drivers/isdn/isdn_x25iface.h
---- linux-2.4.29.old/drivers/isdn/isdn_x25iface.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdn_x25iface.h	2005-03-22 15:06:44.645305664 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdn_x25iface.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdn_x25iface.h	2007-12-15 05:19:40.702740555 +0100
++++ linux-2.4.35.4/drivers/isdn/isdn_x25iface.h	2007-12-15 05:19:55.715596089 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_x25iface.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
 +/* $Id: isdn_x25iface.h,v 1.4 2001/09/24 13:22:43 kai Exp $
   *
   * header for Linux ISDN subsystem, x.25 related functions
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/isdnloop/isdnloop.c linux-2.4.29/drivers/isdn/isdnloop/isdnloop.c
---- linux-2.4.29.old/drivers/isdn/isdnloop/isdnloop.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdnloop/isdnloop.c	2005-03-22 15:06:48.813671976 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdnloop/isdnloop.c	2007-12-15 05:19:40.706740784 +0100
++++ linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c	2007-12-15 05:19:55.715596089 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdnloop.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id: isdnloop.c,v 1.17 2001/08/30 10:45:42 kai Exp $
@@ -18894,18 +19086,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/isdnloop/isdnloop.c linux-2.4.29/drivers
  }
  
  static void __exit
-diff -rNu linux-2.4.29.old/drivers/isdn/isdnloop/isdnloop.h linux-2.4.29/drivers/isdn/isdnloop/isdnloop.h
---- linux-2.4.29.old/drivers/isdn/isdnloop/isdnloop.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/isdnloop/isdnloop.h	2005-03-22 15:06:48.834668784 +0100
+Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/isdnloop/isdnloop.h	2007-12-15 05:19:40.714741240 +0100
++++ linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.h	2007-12-15 05:19:55.719596319 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdnloop.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Loopback lowlevel module for testing of linklevel.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/callbacks.c linux-2.4.29/drivers/isdn/pcbit/callbacks.c
---- linux-2.4.29.old/drivers/isdn/pcbit/callbacks.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/callbacks.c	2005-03-22 15:06:48.909657384 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/callbacks.c	2007-12-15 05:19:40.722741695 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c	2007-12-15 05:19:55.719596319 +0100
 @@ -3,7 +3,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -18915,9 +19109,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/callbacks.c linux-2.4.29/drivers/i
   *
   * This software may be used and distributed according to the terms of 
   * the GNU General Public License, incorporated herein by reference.
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/callbacks.h linux-2.4.29/drivers/isdn/pcbit/callbacks.h
---- linux-2.4.29.old/drivers/isdn/pcbit/callbacks.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/callbacks.h	2005-03-22 15:06:48.953650696 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/callbacks.h	2007-12-15 05:19:40.730742150 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/callbacks.h	2007-12-15 05:19:55.719596319 +0100
 @@ -3,7 +3,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -18927,9 +19122,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/callbacks.h linux-2.4.29/drivers/i
   *
   * This software may be used and distributed according to the terms of 
   * the GNU General Public License, incorporated herein by reference.
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/capi.c linux-2.4.29/drivers/isdn/pcbit/capi.c
---- linux-2.4.29.old/drivers/isdn/pcbit/capi.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/capi.c	2005-03-22 15:06:49.042637168 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/capi.c	2007-12-15 05:19:40.738742606 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/capi.c	2007-12-15 05:19:55.719596319 +0100
 @@ -4,7 +4,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -18939,9 +19135,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/capi.c linux-2.4.29/drivers/isdn/p
   *
   * This software may be used and distributed according to the terms of 
   * the GNU General Public License, incorporated herein by reference.
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/capi.h linux-2.4.29/drivers/isdn/pcbit/capi.h
---- linux-2.4.29.old/drivers/isdn/pcbit/capi.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/capi.h	2005-03-22 15:06:49.071632760 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/capi.h	2007-12-15 05:19:40.746743064 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/capi.h	2007-12-15 05:19:55.719596319 +0100
 @@ -3,7 +3,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -18961,9 +19158,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/capi.h linux-2.4.29/drivers/isdn/p
  capi_channel(struct pcbit_dev *dev, struct sk_buff *skb)
  {
  	ushort callref;
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/drv.c linux-2.4.29/drivers/isdn/pcbit/drv.c
---- linux-2.4.29.old/drivers/isdn/pcbit/drv.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/drv.c	2005-03-22 15:06:49.091629720 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/drv.c	2007-12-15 05:19:40.754743519 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/drv.c	2007-12-15 05:19:55.723596545 +0100
 @@ -3,7 +3,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -19105,9 +19303,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/drv.c linux-2.4.29/drivers/isdn/pc
  		if (capi_decode_conn_conf(chan, skb, &complete)) {
  			printk(KERN_DEBUG "conn_conf indicates error\n");
  			pcbit_fsm_event(dev, chan, EV_ERROR, NULL);
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/edss1.c linux-2.4.29/drivers/isdn/pcbit/edss1.c
---- linux-2.4.29.old/drivers/isdn/pcbit/edss1.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/edss1.c	2005-03-22 15:06:49.119625464 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/edss1.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/edss1.c	2007-12-15 05:19:40.762743974 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/edss1.c	2007-12-15 05:19:55.723596545 +0100
 @@ -4,7 +4,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -19117,9 +19316,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/edss1.c linux-2.4.29/drivers/isdn/
   *
   * This software may be used and distributed according to the terms of 
   * the GNU General Public License, incorporated herein by reference.
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/edss1.h linux-2.4.29/drivers/isdn/pcbit/edss1.h
---- linux-2.4.29.old/drivers/isdn/pcbit/edss1.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/edss1.h	2005-03-22 15:06:49.161619080 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/edss1.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/edss1.h	2007-12-15 05:19:40.770744430 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/edss1.h	2007-12-15 05:19:55.723596545 +0100
 @@ -3,7 +3,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -19129,9 +19329,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/edss1.h linux-2.4.29/drivers/isdn/
   *
   * This software may be used and distributed according to the terms of 
   * the GNU General Public License, incorporated herein by reference.
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/layer2.c linux-2.4.29/drivers/isdn/pcbit/layer2.c
---- linux-2.4.29.old/drivers/isdn/pcbit/layer2.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/layer2.c	2005-03-22 15:06:49.195613912 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/layer2.c	2007-12-15 05:19:40.774744659 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/layer2.c	2007-12-15 05:19:55.723596545 +0100
 @@ -3,7 +3,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -19173,9 +19374,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/layer2.c linux-2.4.29/drivers/isdn
  			return;
  
  		}
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/layer2.h linux-2.4.29/drivers/isdn/pcbit/layer2.h
---- linux-2.4.29.old/drivers/isdn/pcbit/layer2.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/layer2.h	2005-03-22 15:06:49.228608896 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/layer2.h	2007-12-15 05:19:40.782745114 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/layer2.h	2007-12-15 05:19:55.731597000 +0100
 @@ -3,7 +3,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -19185,9 +19387,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/layer2.h linux-2.4.29/drivers/isdn
   *
   * This software may be used and distributed according to the terms of 
   * the GNU General Public License, incorporated herein by reference.
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/module.c linux-2.4.29/drivers/isdn/pcbit/module.c
---- linux-2.4.29.old/drivers/isdn/pcbit/module.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/module.c	2005-03-22 15:06:49.251605400 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/module.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/module.c	2007-12-15 05:19:40.790745570 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/module.c	2007-12-15 05:19:55.731597000 +0100
 @@ -3,7 +3,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -19231,9 +19434,10 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/module.c linux-2.4.29/drivers/isdn
  #endif
  
  module_init(pcbit_init);
-diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/pcbit.h linux-2.4.29/drivers/isdn/pcbit/pcbit.h
---- linux-2.4.29.old/drivers/isdn/pcbit/pcbit.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/pcbit/pcbit.h	2005-03-22 15:06:49.284600384 +0100
+Index: linux-2.4.35.4/drivers/isdn/pcbit/pcbit.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/pcbit/pcbit.h	2007-12-15 05:19:40.798746025 +0100
++++ linux-2.4.35.4/drivers/isdn/pcbit/pcbit.h	2007-12-15 05:19:55.731597000 +0100
 @@ -3,7 +3,7 @@
   *
   * Copyright (C) 1996 Universidade de Lisboa
@@ -19243,18 +19447,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/pcbit.h linux-2.4.29/drivers/isdn/
   *
   * This software may be used and distributed according to the terms of 
   * the GNU General Public License, incorporated herein by reference.
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/card.h linux-2.4.29/drivers/isdn/sc/card.h
---- linux-2.4.29.old/drivers/isdn/sc/card.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/card.h	2005-03-22 15:06:49.333592936 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/card.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/card.h	2007-12-15 05:19:40.806746483 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/card.h	2007-12-15 05:19:55.731597000 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: card.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Driver parameters for SpellCaster ISA ISDN adapters
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/command.c linux-2.4.29/drivers/isdn/sc/command.c
---- linux-2.4.29.old/drivers/isdn/sc/command.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/command.c	2005-03-22 15:06:49.348590656 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/command.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/command.c	2007-12-15 05:19:40.814746939 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/command.c	2007-12-15 05:19:55.735597229 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: command.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
@@ -19270,36 +19476,40 @@ diff -rNu linux-2.4.29.old/drivers/isdn/sc/command.c linux-2.4.29/drivers/isdn/s
  }
  
  /* 
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/debug.c linux-2.4.29/drivers/isdn/sc/debug.c
---- linux-2.4.29.old/drivers/isdn/sc/debug.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/debug.c	2005-03-22 15:06:49.363588376 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/debug.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/debug.c	2007-12-15 05:19:40.822747394 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/debug.c	2007-12-15 05:19:55.735597229 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: debug.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Copyright (C) 1996  SpellCaster Telecommunications Inc.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/debug.h linux-2.4.29/drivers/isdn/sc/debug.h
---- linux-2.4.29.old/drivers/isdn/sc/debug.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/debug.h	2005-03-22 15:06:49.378586096 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/debug.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/debug.h	2007-12-15 05:19:40.830747849 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/debug.h	2007-12-15 05:19:55.735597229 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: debug.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Copyright (C) 1996  SpellCaster Telecommunications Inc.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/event.c linux-2.4.29/drivers/isdn/sc/event.c
---- linux-2.4.29.old/drivers/isdn/sc/event.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/event.c	2005-03-22 15:06:49.394583664 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/event.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/event.c	2007-12-15 05:19:40.838748305 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/event.c	2007-12-15 05:19:55.735597229 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: event.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Copyright (C) 1996  SpellCaster Telecommunications Inc.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/init.c linux-2.4.29/drivers/isdn/sc/init.c
---- linux-2.4.29.old/drivers/isdn/sc/init.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/init.c	2005-03-22 15:06:49.432577888 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/init.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/init.c	2007-12-15 05:19:40.846748763 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/init.c	2007-12-15 05:19:55.735597229 +0100
 @@ -514,6 +514,15 @@
  	schedule_timeout(HZ);
  	sig = readl(rambase + SIG_OFFSET);
@@ -19326,18 +19536,20 @@ diff -rNu linux-2.4.29.old/drivers/isdn/sc/init.c linux-2.4.29/drivers/isdn/sc/i
  	if(sig == SIGNATURE)
  		return BRI_BOARD;
  
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/interrupt.c linux-2.4.29/drivers/isdn/sc/interrupt.c
---- linux-2.4.29.old/drivers/isdn/sc/interrupt.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/interrupt.c	2005-03-22 15:06:49.447575608 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/interrupt.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/interrupt.c	2007-12-15 05:19:40.850748989 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/interrupt.c	2007-12-15 05:19:55.739597458 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: interrupt.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Copyright (C) 1996  SpellCaster Telecommunications Inc.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/ioctl.c linux-2.4.29/drivers/isdn/sc/ioctl.c
---- linux-2.4.29.old/drivers/isdn/sc/ioctl.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/ioctl.c	2005-03-22 15:06:49.463573176 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/ioctl.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/ioctl.c	2007-12-15 05:19:40.858749445 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/ioctl.c	2007-12-15 05:19:55.739597458 +0100
 @@ -23,6 +23,9 @@
  
  extern board *adapter[];
@@ -19348,90 +19560,100 @@ diff -rNu linux-2.4.29.old/drivers/isdn/sc/ioctl.c linux-2.4.29/drivers/isdn/sc/
  
  int GetStatus(int card, boardInfo *);
  
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/message.c linux-2.4.29/drivers/isdn/sc/message.c
---- linux-2.4.29.old/drivers/isdn/sc/message.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/message.c	2005-03-22 15:06:49.478570896 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/message.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/message.c	2007-12-15 05:19:40.866749903 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/message.c	2007-12-15 05:19:55.739597458 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: message.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * functions for sending and receiving control messages
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/message.h linux-2.4.29/drivers/isdn/sc/message.h
---- linux-2.4.29.old/drivers/isdn/sc/message.h	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/message.h	2005-03-22 15:06:49.495568312 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/message.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/message.h	2007-12-15 05:19:40.874750358 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/message.h	2007-12-15 05:19:55.739597458 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: message.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Copyright (C) 1996  SpellCaster Telecommunications Inc.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/packet.c linux-2.4.29/drivers/isdn/sc/packet.c
---- linux-2.4.29.old/drivers/isdn/sc/packet.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/packet.c	2005-03-22 15:06:49.514565424 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/packet.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/packet.c	2007-12-15 05:19:40.882750813 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/packet.c	2007-12-15 05:19:55.739597458 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: packet.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Copyright (C) 1996  SpellCaster Telecommunications Inc.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/shmem.c linux-2.4.29/drivers/isdn/sc/shmem.c
---- linux-2.4.29.old/drivers/isdn/sc/shmem.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/shmem.c	2005-03-22 15:06:49.560558432 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/shmem.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/shmem.c	2007-12-15 05:19:40.890751269 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/shmem.c	2007-12-15 05:19:55.743597685 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: shmem.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Copyright (C) 1996  SpellCaster Telecommunications Inc.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/sc/timer.c linux-2.4.29/drivers/isdn/sc/timer.c
---- linux-2.4.29.old/drivers/isdn/sc/timer.c	2005-03-22 14:47:56.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/sc/timer.c	2005-03-22 15:06:49.575556152 +0100
+Index: linux-2.4.35.4/drivers/isdn/sc/timer.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/sc/timer.c	2007-12-15 05:19:40.898751724 +0100
++++ linux-2.4.35.4/drivers/isdn/sc/timer.c	2007-12-15 05:19:55.743597685 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: timer.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Copyright (C) 1996  SpellCaster Telecommunications Inc.
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam.h linux-2.4.29/drivers/isdn/tpam/tpam.h
---- linux-2.4.29.old/drivers/isdn/tpam/tpam.h	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/tpam/tpam.h	2005-03-22 15:06:49.648545056 +0100
+Index: linux-2.4.35.4/drivers/isdn/tpam/tpam.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam.h	2007-12-15 05:19:40.906752182 +0100
++++ linux-2.4.35.4/drivers/isdn/tpam/tpam.h	2007-12-15 05:19:55.743597685 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: tpam.h,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id: tpam.h,v 1.3 2001/09/24 13:23:12 kai Exp $
   *
   * Turbo PAM ISDN driver for Linux. (Kernel Driver)
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_commands.c linux-2.4.29/drivers/isdn/tpam/tpam_commands.c
---- linux-2.4.29.old/drivers/isdn/tpam/tpam_commands.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/tpam/tpam_commands.c	2005-03-22 15:06:49.664542624 +0100
+Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_commands.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_commands.c	2007-12-15 05:19:40.914752638 +0100
++++ linux-2.4.35.4/drivers/isdn/tpam/tpam_commands.c	2007-12-15 05:19:55.743597685 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: tpam_commands.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id: tpam_commands.c,v 1.3 2001/09/24 13:23:12 kai Exp $
   *
   * Turbo PAM ISDN driver for Linux. (Kernel Driver - ISDN commands)
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_crcpc.c linux-2.4.29/drivers/isdn/tpam/tpam_crcpc.c
---- linux-2.4.29.old/drivers/isdn/tpam/tpam_crcpc.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/tpam/tpam_crcpc.c	2005-03-22 15:06:49.681540040 +0100
+Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_crcpc.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_crcpc.c	2007-12-15 05:19:40.922753093 +0100
++++ linux-2.4.35.4/drivers/isdn/tpam/tpam_crcpc.c	2007-12-15 05:19:55.747597911 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: tpam_crcpc.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Turbo PAM ISDN driver for Linux. (Kernel Driver - CRC encoding)
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_hdlc.c linux-2.4.29/drivers/isdn/tpam/tpam_hdlc.c
---- linux-2.4.29.old/drivers/isdn/tpam/tpam_hdlc.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/tpam/tpam_hdlc.c	2005-03-22 15:06:49.702536848 +0100
+Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_hdlc.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_hdlc.c	2007-12-15 05:19:40.926753322 +0100
++++ linux-2.4.35.4/drivers/isdn/tpam/tpam_hdlc.c	2007-12-15 05:19:55.747597911 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: tpam_hdlc.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id: tpam_hdlc.c,v 1.3 2001/09/24 13:23:12 kai Exp $
   *
   * Turbo PAM ISDN driver for Linux. (Kernel Driver - HDLC encoding)
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_main.c linux-2.4.29/drivers/isdn/tpam/tpam_main.c
---- linux-2.4.29.old/drivers/isdn/tpam/tpam_main.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/tpam/tpam_main.c	2005-03-22 15:06:49.717534568 +0100
+Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_main.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_main.c	2007-12-15 05:19:40.934753777 +0100
++++ linux-2.4.35.4/drivers/isdn/tpam/tpam_main.c	2007-12-15 05:19:55.747597911 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: tpam_main.c,v 1.1.2.2 2001/12/09 18:45:14 kai Exp $
 +/* $Id$
@@ -19447,27 +19669,30 @@ diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_main.c linux-2.4.29/drivers/is
  };
  
  static int __init tpam_init(void) {
-diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_memory.c linux-2.4.29/drivers/isdn/tpam/tpam_memory.c
---- linux-2.4.29.old/drivers/isdn/tpam/tpam_memory.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/tpam/tpam_memory.c	2005-03-22 15:06:49.734531984 +0100
+Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_memory.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_memory.c	2007-12-15 05:19:40.942754233 +0100
++++ linux-2.4.35.4/drivers/isdn/tpam/tpam_memory.c	2007-12-15 05:19:55.747597911 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: tpam_memory.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Turbo PAM ISDN driver for Linux. (Kernel Driver - Board Memory Access)
   *
-diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_nco.c linux-2.4.29/drivers/isdn/tpam/tpam_nco.c
---- linux-2.4.29.old/drivers/isdn/tpam/tpam_nco.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/tpam/tpam_nco.c	2005-03-22 15:06:49.749529704 +0100
+Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_nco.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_nco.c	2007-12-15 05:19:40.950754688 +0100
++++ linux-2.4.35.4/drivers/isdn/tpam/tpam_nco.c	2007-12-15 05:19:55.751598140 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: tpam_nco.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
   *
   * Turbo PAM ISDN driver for Linux. 
   * (Kernel Driver - Low Level NCO Manipulation)
-diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_queues.c linux-2.4.29/drivers/isdn/tpam/tpam_queues.c
---- linux-2.4.29.old/drivers/isdn/tpam/tpam_queues.c	2005-03-22 14:47:57.000000000 +0100
-+++ linux-2.4.29/drivers/isdn/tpam/tpam_queues.c	2005-03-22 15:06:49.764527424 +0100
+Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_queues.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_queues.c	2007-12-15 05:19:40.962755372 +0100
++++ linux-2.4.35.4/drivers/isdn/tpam/tpam_queues.c	2007-12-15 05:19:55.751598140 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: tpam_queues.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
 +/* $Id$
@@ -19482,36 +19707,40 @@ diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_queues.c linux-2.4.29/drivers/
  				spin_unlock(&card->lock);
  				printk(KERN_ERR "TurboPAM(tpam_irq): "
  						"waiting too long...\n");
-diff -rNu linux-2.4.29.old/include/linux/b1lli.h linux-2.4.29/include/linux/b1lli.h
---- linux-2.4.29.old/include/linux/b1lli.h	2005-03-22 14:47:32.000000000 +0100
-+++ linux-2.4.29/include/linux/b1lli.h	2005-03-22 15:06:49.881509640 +0100
+Index: linux-2.4.35.4/include/linux/b1lli.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/b1lli.h	2007-12-15 05:19:40.966755602 +0100
++++ linux-2.4.35.4/include/linux/b1lli.h	2007-12-15 05:19:55.751598140 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: b1lli.h,v 1.8.8.3 2001/09/23 22:25:05 kai Exp $
 +/* $Id$
   *
   * ISDN lowlevel-module for AVM B1-card.
   *
-diff -rNu linux-2.4.29.old/include/linux/b1pcmcia.h linux-2.4.29/include/linux/b1pcmcia.h
---- linux-2.4.29.old/include/linux/b1pcmcia.h	2005-03-22 14:47:32.000000000 +0100
-+++ linux-2.4.29/include/linux/b1pcmcia.h	2005-03-22 15:06:49.862512528 +0100
+Index: linux-2.4.35.4/include/linux/b1pcmcia.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/b1pcmcia.h	2007-12-15 05:19:40.974756057 +0100
++++ linux-2.4.35.4/include/linux/b1pcmcia.h	2007-12-15 05:19:55.751598140 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: b1pcmcia.h,v 1.1.8.2 2001/09/23 22:25:05 kai Exp $
 +/* $Id$
   *
   * Exported functions of module b1pcmcia to be called by
   * avm_cs card services module.
-diff -rNu linux-2.4.29.old/include/linux/capi.h linux-2.4.29/include/linux/capi.h
---- linux-2.4.29.old/include/linux/capi.h	2005-03-22 14:47:32.000000000 +0100
-+++ linux-2.4.29/include/linux/capi.h	2005-03-22 15:06:49.922503408 +0100
+Index: linux-2.4.35.4/include/linux/capi.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/capi.h	2007-12-15 05:19:40.982756512 +0100
++++ linux-2.4.35.4/include/linux/capi.h	2007-12-15 05:19:55.751598140 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: capi.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $
 +/* $Id$
   * 
   * CAPI 2.0 Interface for Linux
   * 
-diff -rNu linux-2.4.29.old/include/linux/concap.h linux-2.4.29/include/linux/concap.h
---- linux-2.4.29.old/include/linux/concap.h	2005-03-22 14:47:32.000000000 +0100
-+++ linux-2.4.29/include/linux/concap.h	2005-03-22 15:06:49.906505840 +0100
+Index: linux-2.4.35.4/include/linux/concap.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/concap.h	2007-12-15 05:19:40.990756968 +0100
++++ linux-2.4.35.4/include/linux/concap.h	2007-12-15 05:19:55.755598369 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: concap.h,v 1.2.8.1 2001/09/23 22:25:05 kai Exp $
 +/* $Id: concap.h,v 1.3 2001/09/24 13:23:13 kai Exp $
@@ -19526,27 +19755,30 @@ diff -rNu linux-2.4.29.old/include/linux/concap.h linux-2.4.29/include/linux/con
  
  /* Stuff to support encapsulation protocols genericly. The encapsulation
     protocol is processed at the uppermost layer of the network interface.
-diff -rNu linux-2.4.29.old/include/linux/hysdn_if.h linux-2.4.29/include/linux/hysdn_if.h
---- linux-2.4.29.old/include/linux/hysdn_if.h	2005-03-22 14:47:32.000000000 +0100
-+++ linux-2.4.29/include/linux/hysdn_if.h	2005-03-22 15:06:49.974495504 +0100
+Index: linux-2.4.35.4/include/linux/hysdn_if.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/hysdn_if.h	2007-12-15 05:19:40.998757423 +0100
++++ linux-2.4.35.4/include/linux/hysdn_if.h	2007-12-15 05:19:55.755598369 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: hysdn_if.h,v 1.1.8.3 2001/09/23 22:25:05 kai Exp $
 +/* $Id$
   *
   * Linux driver for HYSDN cards
   * ioctl definitions shared by hynetmgr and driver.
-diff -rNu linux-2.4.29.old/include/linux/isdn/tpam.h linux-2.4.29/include/linux/isdn/tpam.h
---- linux-2.4.29.old/include/linux/isdn/tpam.h	2005-03-22 14:47:32.000000000 +0100
-+++ linux-2.4.29/include/linux/isdn/tpam.h	2005-03-22 15:06:49.947499608 +0100
+Index: linux-2.4.35.4/include/linux/isdn/tpam.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/isdn/tpam.h	2007-12-15 05:19:41.006757881 +0100
++++ linux-2.4.35.4/include/linux/isdn/tpam.h	2007-12-15 05:19:55.755598369 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: tpam.h,v 1.1.2.1 2001/11/20 14:19:38 kai Exp $
 +/* $Id$
   *
   * Turbo PAM ISDN driver for Linux. (Kernel Driver)
   *
-diff -rNu linux-2.4.29.old/include/linux/isdn.h linux-2.4.29/include/linux/isdn.h
---- linux-2.4.29.old/include/linux/isdn.h	2005-03-22 14:47:31.000000000 +0100
-+++ linux-2.4.29/include/linux/isdn.h	2005-03-22 15:06:50.001491400 +0100
+Index: linux-2.4.35.4/include/linux/isdn.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/isdn.h	2007-12-15 05:19:41.014758337 +0100
++++ linux-2.4.35.4/include/linux/isdn.h	2007-12-15 05:19:55.755598369 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $
 +/* $Id: isdn.h,v 1.125 2001/12/01 23:18:21 detabc Exp $
@@ -19769,9 +20001,10 @@ diff -rNu linux-2.4.29.old/include/linux/isdn.h linux-2.4.29/include/linux/isdn.
  
  #endif /* __KERNEL__ */
  
-diff -rNu linux-2.4.29.old/include/linux/isdn_compat.h linux-2.4.29/include/linux/isdn_compat.h
---- linux-2.4.29.old/include/linux/isdn_compat.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/include/linux/isdn_compat.h	2005-03-22 15:06:50.017488968 +0100
+Index: linux-2.4.35.4/include/linux/isdn_compat.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/isdn_compat.h	2007-12-15 05:19:55.755598369 +0100
 @@ -0,0 +1,261 @@
 +/* $Id: isdn_compat.h,v 1.53 2001/09/24 13:23:13 kai Exp $
 + *
@@ -20034,9 +20267,10 @@ diff -rNu linux-2.4.29.old/include/linux/isdn_compat.h linux-2.4.29/include/linu
 +
 +#endif /* __KERNEL__ */
 +#endif /* _LINUX_ISDN_COMPAT_H */
-diff -rNu linux-2.4.29.old/include/linux/isdn_divertif.h linux-2.4.29/include/linux/isdn_divertif.h
---- linux-2.4.29.old/include/linux/isdn_divertif.h	2005-03-22 14:47:32.000000000 +0100
-+++ linux-2.4.29/include/linux/isdn_divertif.h	2005-03-22 15:06:50.032486688 +0100
+Index: linux-2.4.35.4/include/linux/isdn_divertif.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/isdn_divertif.h	2007-12-15 05:19:41.026759021 +0100
++++ linux-2.4.35.4/include/linux/isdn_divertif.h	2007-12-15 05:19:55.759598598 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_divertif.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $
 +/* $Id$
@@ -20060,9 +20294,10 @@ diff -rNu linux-2.4.29.old/include/linux/isdn_divertif.h linux-2.4.29/include/li
    } isdn_divert_if;
  
  /*********************/
-diff -rNu linux-2.4.29.old/include/linux/isdn_dwabc.h linux-2.4.29/include/linux/isdn_dwabc.h
---- linux-2.4.29.old/include/linux/isdn_dwabc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29/include/linux/isdn_dwabc.h	2005-03-22 15:06:50.048484256 +0100
+Index: linux-2.4.35.4/include/linux/isdn_dwabc.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/isdn_dwabc.h	2007-12-15 05:19:55.759598598 +0100
 @@ -0,0 +1,84 @@
 +/* $Id: isdn_dwabc.h,v 1.9 2001/09/26 20:32:08 detabc Exp $
 + *
@@ -20148,18 +20383,20 @@ diff -rNu linux-2.4.29.old/include/linux/isdn_dwabc.h linux-2.4.29/include/linux
 +};
 +
 +#endif
-diff -rNu linux-2.4.29.old/include/linux/isdn_lzscomp.h linux-2.4.29/include/linux/isdn_lzscomp.h
---- linux-2.4.29.old/include/linux/isdn_lzscomp.h	2005-03-22 14:47:32.000000000 +0100
-+++ linux-2.4.29/include/linux/isdn_lzscomp.h	2005-03-22 15:06:50.089478024 +0100
+Index: linux-2.4.35.4/include/linux/isdn_lzscomp.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/isdn_lzscomp.h	2007-12-15 05:19:41.042759932 +0100
++++ linux-2.4.35.4/include/linux/isdn_lzscomp.h	2007-12-15 05:19:55.759598598 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdn_lzscomp.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $
 +/* $Id$
   *
   * Header for isdn_lzscomp.c
   * Concentrated here to not mess up half a dozen kernel headers with code
-diff -rNu linux-2.4.29.old/include/linux/isdn_ppp.h linux-2.4.29/include/linux/isdn_ppp.h
---- linux-2.4.29.old/include/linux/isdn_ppp.h	2005-03-22 14:47:31.000000000 +0100
-+++ linux-2.4.29/include/linux/isdn_ppp.h	2005-03-22 15:06:50.116473920 +0100
+Index: linux-2.4.35.4/include/linux/isdn_ppp.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/isdn_ppp.h	2007-12-15 05:19:41.046760161 +0100
++++ linux-2.4.35.4/include/linux/isdn_ppp.h	2007-12-15 05:19:55.759598598 +0100
 @@ -8,6 +8,7 @@
  #ifndef _LINUX_ISDN_PPP_H
  #define _LINUX_ISDN_PPP_H
@@ -20201,9 +20438,10 @@ diff -rNu linux-2.4.29.old/include/linux/isdn_ppp.h linux-2.4.29/include/linux/i
    unsigned long debug;
    struct isdn_ppp_compressor *compressor,*decompressor;
    struct isdn_ppp_compressor *link_compressor,*link_decompressor;
-diff -rNu linux-2.4.29.old/include/linux/isdnif.h linux-2.4.29/include/linux/isdnif.h
---- linux-2.4.29.old/include/linux/isdnif.h	2005-03-22 14:47:31.000000000 +0100
-+++ linux-2.4.29/include/linux/isdnif.h	2005-03-22 15:06:50.132471488 +0100
+Index: linux-2.4.35.4/include/linux/isdnif.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/isdnif.h	2007-12-15 05:19:41.054760616 +0100
++++ linux-2.4.35.4/include/linux/isdnif.h	2007-12-15 05:19:55.759598598 +0100
 @@ -1,4 +1,4 @@
 -/* $Id: isdnif.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $
 +/* $Id: isdnif.h,v 1.43 2002/02/09 21:19:11 keil Exp $
@@ -20227,9 +20465,10 @@ diff -rNu linux-2.4.29.old/include/linux/isdnif.h linux-2.4.29/include/linux/isd
  
  /*
   * Audio commands
-diff -rNu linux-2.4.29.old/include/linux/kernelcapi.h linux-2.4.29/include/linux/kernelcapi.h
---- linux-2.4.29.old/include/linux/kernelcapi.h	2005-03-22 14:47:32.000000000 +0100
-+++ linux-2.4.29/include/linux/kernelcapi.h	2005-03-22 15:06:50.147469208 +0100
+Index: linux-2.4.35.4/include/linux/kernelcapi.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/kernelcapi.h	2007-12-15 05:19:41.066761301 +0100
++++ linux-2.4.35.4/include/linux/kernelcapi.h	2007-12-15 05:19:55.759598598 +0100
 @@ -1,12 +1,10 @@
 -/* $Id: kernelcapi.h,v 1.1.4.2 2002/01/28 18:25:10 kai Exp $
 +/*
diff --git a/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch b/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch
index 4ef20fa8ba..302f6bbee3 100644
--- a/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch
+++ b/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch
@@ -1,6 +1,7 @@
-diff -rNu linux-2.4.29.old/drivers/Makefile linux-2.4.29/drivers/Makefile
---- linux-2.4.29.old/drivers/Makefile	2005-03-22 14:47:41.000000000 +0100
-+++ linux-2.4.29/drivers/Makefile	2005-03-22 15:15:20.012957872 +0100
+Index: linux-2.4.35.4/drivers/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/Makefile	2007-12-15 05:19:39.306660996 +0100
++++ linux-2.4.35.4/drivers/Makefile	2007-12-15 05:19:59.111789629 +0100
 @@ -38,7 +38,7 @@
  subdir-$(CONFIG_MD)		+= md
  subdir-$(CONFIG_IEEE1394)	+= ieee1394
@@ -10,9 +11,10 @@ diff -rNu linux-2.4.29.old/drivers/Makefile linux-2.4.29/drivers/Makefile
  subdir-$(CONFIG_ATM)		+= atm
  subdir-$(CONFIG_FC4)		+= fc4
  
-diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_usb.c linux-2.4.29/drivers/isdn/hisax/hfc_usb.c
---- linux-2.4.29.old/drivers/isdn/hisax/hfc_usb.c	2005-03-22 15:13:58.233390256 +0100
-+++ linux-2.4.29/drivers/isdn/hisax/hfc_usb.c	2005-03-22 15:14:57.475384104 +0100
+Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_usb.c	2007-12-15 05:19:55.575588111 +0100
++++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c	2007-12-15 05:19:59.115789855 +0100
 @@ -1,13 +1,11 @@
 -/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $
 +/*
diff --git a/target/linux/generic-2.4/patches/202-pl2303_backport.patch b/target/linux/generic-2.4/patches/202-pl2303_backport.patch
index f889ad2964..c01f0aad1b 100644
--- a/target/linux/generic-2.4/patches/202-pl2303_backport.patch
+++ b/target/linux/generic-2.4/patches/202-pl2303_backport.patch
@@ -1,6 +1,7 @@
-diff -ur linux-2.4.32/drivers/usb/serial/pl2303.c linux-2.4.32.openwrt/drivers/usb/serial/pl2303.c
---- linux-2.4.32/drivers/usb/serial/pl2303.c	2005-06-01 02:56:56.000000000 +0200
-+++ linux-2.4.32.openwrt/drivers/usb/serial/pl2303.c	2005-11-18 12:22:23.000000000 +0100
+Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.c	2007-12-15 05:19:39.266658716 +0100
++++ linux-2.4.35.4/drivers/usb/serial/pl2303.c	2007-12-15 05:19:59.351803306 +0100
 @@ -78,6 +78,11 @@
  	{ USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) },
  	{ USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) },
@@ -13,9 +14,10 @@ diff -ur linux-2.4.32/drivers/usb/serial/pl2303.c linux-2.4.32.openwrt/drivers/u
  	{ }					/* Terminating entry */
  };
  
-diff -ur linux-2.4.32/drivers/usb/serial/pl2303.h linux-2.4.32.openwrt/drivers/usb/serial/pl2303.h
---- linux-2.4.32/drivers/usb/serial/pl2303.h	2004-02-18 14:36:31.000000000 +0100
-+++ linux-2.4.32.openwrt/drivers/usb/serial/pl2303.h	2005-11-18 12:23:38.000000000 +0100
+Index: linux-2.4.35.4/drivers/usb/serial/pl2303.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.h	2007-12-15 05:19:39.278659401 +0100
++++ linux-2.4.35.4/drivers/usb/serial/pl2303.h	2007-12-15 05:19:59.355803533 +0100
 @@ -41,3 +41,21 @@
  
  #define SITECOM_VENDOR_ID	0x6189
diff --git a/target/linux/generic-2.4/patches/203-hfsplus_fix.patch b/target/linux/generic-2.4/patches/203-hfsplus_fix.patch
index 695a2d36b5..edec21a891 100644
--- a/target/linux/generic-2.4/patches/203-hfsplus_fix.patch
+++ b/target/linux/generic-2.4/patches/203-hfsplus_fix.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.4.30.old/fs/hfsplus/super.c linux-2.4.30.dev/fs/hfsplus/super.c
---- linux-2.4.30.old/fs/hfsplus/super.c	2003-08-25 13:44:43.000000000 +0200
-+++ linux-2.4.30.dev/fs/hfsplus/super.c	2005-04-27 19:54:40.000000000 +0200
+Index: linux-2.4.35.4/fs/hfsplus/super.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/hfsplus/super.c	2007-12-15 05:19:39.238657121 +0100
++++ linux-2.4.35.4/fs/hfsplus/super.c	2007-12-15 05:19:59.575816071 +0100
 @@ -240,8 +240,7 @@
  	if (!(*flags & MS_RDONLY)) {
  		struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr;
diff --git a/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch b/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch
index 9cf055346a..10b7448c72 100644
--- a/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch
+++ b/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch
@@ -1,6 +1,7 @@
-diff -Nur linux-2.4.30/arch/mips/kernel/signal.c linux-2.4.30.openwrt/arch/mips/kernel/signal.c
---- linux-2.4.30/arch/mips/kernel/signal.c	2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips/kernel/signal.c	2005-07-02 13:00:49.000000000 +0200
+Index: linux-2.4.35.4/arch/mips/kernel/signal.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/signal.c	2007-12-15 05:19:39.146651877 +0100
++++ linux-2.4.35.4/arch/mips/kernel/signal.c	2007-12-15 05:19:59.787828152 +0100
 @@ -6,8 +6,10 @@
   * Copyright (C) 1991, 1992  Linus Torvalds
   * Copyright (C) 1994 - 1999  Ralf Baechle
@@ -34,9 +35,10 @@ diff -Nur linux-2.4.30/arch/mips/kernel/signal.c linux-2.4.30.openwrt/arch/mips/
  {
  	sigset_t *unewset, saveset, newset;
          size_t sigsetsize;
-diff -Nur linux-2.4.30/arch/mips/kernel/syscall.c linux-2.4.30.openwrt/arch/mips/kernel/syscall.c
---- linux-2.4.30/arch/mips/kernel/syscall.c	2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips/kernel/syscall.c	2005-07-02 13:00:49.000000000 +0200
+Index: linux-2.4.35.4/arch/mips/kernel/syscall.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/syscall.c	2007-12-15 05:19:39.154652335 +0100
++++ linux-2.4.35.4/arch/mips/kernel/syscall.c	2007-12-15 05:19:59.795828608 +0100
 @@ -5,6 +5,7 @@
   *
   * Copyright (C) 1995 - 2000 by Ralf Baechle
@@ -67,9 +69,10 @@ diff -Nur linux-2.4.30/arch/mips/kernel/syscall.c linux-2.4.30.openwrt/arch/mips
  {
  	unsigned long clone_flags;
  	unsigned long newsp;
-diff -Nur linux-2.4.30/arch/mips/ld.script.in linux-2.4.30.openwrt/arch/mips/ld.script.in
---- linux-2.4.30/arch/mips/ld.script.in	2005-07-02 13:00:22.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips/ld.script.in	2005-07-02 13:00:42.000000000 +0200
+Index: linux-2.4.35.4/arch/mips/ld.script.in
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/ld.script.in	2007-12-15 05:19:39.162652791 +0100
++++ linux-2.4.35.4/arch/mips/ld.script.in	2007-12-15 05:19:59.799828834 +0100
 @@ -9,6 +9,7 @@
    {
      _ftext = . ;
@@ -78,9 +81,10 @@ diff -Nur linux-2.4.30/arch/mips/ld.script.in linux-2.4.30.openwrt/arch/mips/ld.
      *(.rodata)
      *(.rodata.*)
      *(.rodata1)
-diff -Nur linux-2.4.30/arch/mips64/kernel/signal.c linux-2.4.30.openwrt/arch/mips64/kernel/signal.c
---- linux-2.4.30/arch/mips64/kernel/signal.c	2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips64/kernel/signal.c	2005-07-02 13:00:49.000000000 +0200
+Index: linux-2.4.35.4/arch/mips64/kernel/signal.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/signal.c	2007-12-15 05:19:39.170653246 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/signal.c	2007-12-15 05:19:59.803829063 +0100
 @@ -6,8 +6,10 @@
   * Copyright (C) 1991, 1992  Linus Torvalds
   * Copyright (C) 1994 - 2000  Ralf Baechle
@@ -103,9 +107,10 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/signal.c linux-2.4.30.openwrt/arch/mip
  {
  	sigset_t *unewset, saveset, newset;
          size_t sigsetsize;
-diff -Nur linux-2.4.30/arch/mips64/kernel/signal32.c linux-2.4.30.openwrt/arch/mips64/kernel/signal32.c
---- linux-2.4.30/arch/mips64/kernel/signal32.c	2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips64/kernel/signal32.c	2005-07-02 13:00:49.000000000 +0200
+Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/signal32.c	2007-12-15 05:19:39.174653475 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/signal32.c	2007-12-15 05:19:59.807829292 +0100
 @@ -6,7 +6,9 @@
   * Copyright (C) 1991, 1992  Linus Torvalds
   * Copyright (C) 1994 - 2000  Ralf Baechle
@@ -138,9 +143,10 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/signal32.c linux-2.4.30.openwrt/arch/m
  {
  	sigset32_t *uset;
  	sigset_t newset, saveset;
-diff -Nur linux-2.4.30/arch/mips64/kernel/syscall.c linux-2.4.30.openwrt/arch/mips64/kernel/syscall.c
---- linux-2.4.30/arch/mips64/kernel/syscall.c	2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/arch/mips64/kernel/syscall.c	2005-07-02 13:00:49.000000000 +0200
+Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips64/kernel/syscall.c	2007-12-15 05:19:39.186654157 +0100
++++ linux-2.4.35.4/arch/mips64/kernel/syscall.c	2007-12-15 05:19:59.811829522 +0100
 @@ -6,7 +6,9 @@
   * Copyright (C) 1995 - 2000, 2001 by Ralf Baechle
   * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
@@ -173,9 +179,10 @@ diff -Nur linux-2.4.30/arch/mips64/kernel/syscall.c linux-2.4.30.openwrt/arch/mi
  {
  	unsigned long clone_flags;
  	unsigned long newsp;
-diff -Nur linux-2.4.30/include/asm-mips/ptrace.h linux-2.4.30.openwrt/include/asm-mips/ptrace.h
---- linux-2.4.30/include/asm-mips/ptrace.h	2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/include/asm-mips/ptrace.h	2005-07-02 13:00:49.000000000 +0200
+Index: linux-2.4.35.4/include/asm-mips/ptrace.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips/ptrace.h	2007-12-15 05:19:39.194654615 +0100
++++ linux-2.4.35.4/include/asm-mips/ptrace.h	2007-12-15 05:19:59.815829748 +0100
 @@ -4,6 +4,7 @@
   * for more details.
   *
@@ -198,9 +205,10 @@ diff -Nur linux-2.4.30/include/asm-mips/ptrace.h linux-2.4.30.openwrt/include/as
  #endif /* !__ASSEMBLY__ */
  
  /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-diff -Nur linux-2.4.30/include/asm-mips64/ptrace.h linux-2.4.30.openwrt/include/asm-mips64/ptrace.h
---- linux-2.4.30/include/asm-mips64/ptrace.h	2005-07-02 13:00:13.000000000 +0200
-+++ linux-2.4.30.openwrt/include/asm-mips64/ptrace.h	2005-07-02 13:00:49.000000000 +0200
+Index: linux-2.4.35.4/include/asm-mips64/ptrace.h
+===================================================================
+--- linux-2.4.35.4.orig/include/asm-mips64/ptrace.h	2007-12-15 05:19:39.202655071 +0100
++++ linux-2.4.35.4/include/asm-mips64/ptrace.h	2007-12-15 05:19:59.815829748 +0100
 @@ -5,6 +5,7 @@
   *
   * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle
diff --git a/target/linux/generic-2.4/patches/208-usb2_fix.patch b/target/linux/generic-2.4/patches/208-usb2_fix.patch
index f8e5be12c1..fe6b10dfd2 100644
--- a/target/linux/generic-2.4/patches/208-usb2_fix.patch
+++ b/target/linux/generic-2.4/patches/208-usb2_fix.patch
@@ -1,7 +1,8 @@
-diff -ur linux-2.4.30.dev/drivers/usb/host/ehci-q.c linux-tmp/drivers/usb/host/ehci-q.c
---- linux-2.4.30.dev/drivers/usb/host/ehci-q.c	2005-01-19 15:10:07.000000000 +0100
-+++ linux-tmp/drivers/usb/host/ehci-q.c	2005-03-30 05:11:12.000000000 +0200
-@@ -783,6 +765,11 @@
+Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c	2007-12-15 05:19:39.114650056 +0100
++++ linux-2.4.35.4/drivers/usb/host/ehci-q.c	2007-12-15 05:20:00.107846389 +0100
+@@ -782,6 +782,11 @@
  		if (!(cmd & CMD_ASE)) {
  			/* in case a clear of CMD_ASE didn't take yet */
  			(void) handshake (&ehci->regs->status, STS_ASS, 0, 150);
diff --git a/target/linux/generic-2.4/patches/209-build_fixes.patch b/target/linux/generic-2.4/patches/209-build_fixes.patch
index c48489625e..dbb5a88e64 100644
--- a/target/linux/generic-2.4/patches/209-build_fixes.patch
+++ b/target/linux/generic-2.4/patches/209-build_fixes.patch
@@ -1,7 +1,8 @@
-diff -urN linux.old/Makefile linux.dev/Makefile
---- linux.old/Makefile	2005-08-26 13:41:41.689634168 +0200
-+++ linux.dev/Makefile	2005-08-26 13:44:34.233403528 +0200
-@@ -354,7 +354,7 @@
+Index: linux-2.4.35.4/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/Makefile	2007-12-15 05:19:51.427351715 +0100
++++ linux-2.4.35.4/Makefile	2007-12-15 05:20:00.315858242 +0100
+@@ -362,7 +362,7 @@
  	@rm -f .ver1
  
  include/linux/version.h: ./Makefile
@@ -10,7 +11,7 @@ diff -urN linux.old/Makefile linux.dev/Makefile
  	  (echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false)
  	@echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
  	@echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
-@@ -509,7 +509,7 @@
+@@ -500,7 +500,7 @@
  ifdef CONFIG_MODVERSIONS
  	$(MAKE) update-modverfile
  endif
@@ -19,8 +20,10 @@ diff -urN linux.old/Makefile linux.dev/Makefile
  	scripts/mkdep -- init/*.c > .depend
  
  ifdef CONFIG_MODVERSIONS
---- linux.old/Rules.make	2005-08-31 00:37:34.363109288 +0200
-+++ linux.dev/Rules.make	2005-08-31 13:59:20.140676296 +0200
+Index: linux-2.4.35.4/Rules.make
+===================================================================
+--- linux-2.4.35.4.orig/Rules.make	2007-12-15 05:19:39.078648003 +0100
++++ linux-2.4.35.4/Rules.make	2007-12-15 05:20:00.315858242 +0100
 @@ -126,7 +126,7 @@
  # This make dependencies quickly
  #
diff --git a/target/linux/generic-2.4/patches/210-fix-irq-serial.patch b/target/linux/generic-2.4/patches/210-fix-irq-serial.patch
index 630dc04977..5fb1bfec6f 100644
--- a/target/linux/generic-2.4/patches/210-fix-irq-serial.patch
+++ b/target/linux/generic-2.4/patches/210-fix-irq-serial.patch
@@ -1,6 +1,8 @@
---- linux-2.4.30/drivers/char/serial.c	2005-06-29 20:44:46.000000000 +0200
-+++ linux-2.4.30.serial/drivers/char/serial.c	2005-06-29 21:15:12.000000000 +0200
-@@ -5455,18 +5455,6 @@
+Index: linux-2.4.35.4/drivers/char/serial.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/char/serial.c	2007-12-15 05:19:44.934981737 +0100
++++ linux-2.4.35.4/drivers/char/serial.c	2007-12-15 05:20:00.539871010 +0100
+@@ -5458,18 +5458,6 @@
  		       sizeof(struct rs_multiport_struct));
  #endif
  	}
diff --git a/target/linux/generic-2.4/patches/212-htb_time_fix.patch b/target/linux/generic-2.4/patches/212-htb_time_fix.patch
index 7281093b02..1bcdc01097 100644
--- a/target/linux/generic-2.4/patches/212-htb_time_fix.patch
+++ b/target/linux/generic-2.4/patches/212-htb_time_fix.patch
@@ -1,5 +1,7 @@
---- linux.old/net/sched/sch_htb.c	2005-11-15 14:09:41.548066000 +0100
-+++ linux.dev/net/sched/sch_htb.c	2005-11-15 14:08:34.000000000 +0100
+Index: linux-2.4.35.4/net/sched/sch_htb.c
+===================================================================
+--- linux-2.4.35.4.orig/net/sched/sch_htb.c	2007-12-15 05:19:39.010644128 +0100
++++ linux-2.4.35.4/net/sched/sch_htb.c	2007-12-15 05:20:00.751883092 +0100
 @@ -369,7 +369,7 @@
  		struct list_head *l;
  		list_for_each (l,q->hash+i) {
diff --git a/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch b/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch
index 5d0ff92662..c2b81901f5 100644
--- a/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch
+++ b/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch
@@ -1,5 +1,7 @@
---- linux.old/net/sched/sch_htb.c	2005-11-15 14:09:41.548066000 +0100
-+++ linux.dev/net/sched/sch_htb.c	2005-11-15 14:08:34.000000000 +0100
+Index: linux-2.4.35.4/net/sched/sch_htb.c
+===================================================================
+--- linux-2.4.35.4.orig/net/sched/sch_htb.c	2007-12-15 05:20:00.751883092 +0100
++++ linux-2.4.35.4/net/sched/sch_htb.c	2007-12-15 05:20:00.959894945 +0100
 @@ -74,7 +74,7 @@
  #define HTB_EWMAC 2	/* rate average over HTB_EWMAC*HTB_HSIZE sec */
  #define HTB_DEBUG 1	/* compile debugging support (activated by tc tool) */
diff --git a/target/linux/generic-2.4/patches/222-sound.patch b/target/linux/generic-2.4/patches/222-sound.patch
index 351e8c2072..889964baef 100644
--- a/target/linux/generic-2.4/patches/222-sound.patch
+++ b/target/linux/generic-2.4/patches/222-sound.patch
@@ -1,6 +1,7 @@
-diff -rNu linux-2.4.30/drivers/sound/sound_core.c linux-2.4.30.new/drivers/sound/sound_core.c
---- linux-2.4.30/drivers/sound/sound_core.c	2001-10-01 05:26:08.000000000 +1000
-+++ linux-2.4.30.new/drivers/sound/sound_core.c	2005-08-27 22:52:55.061719968 +1000
+Index: linux-2.4.35.4/drivers/sound/sound_core.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/sound/sound_core.c	2007-12-15 05:19:38.946640480 +0100
++++ linux-2.4.35.4/drivers/sound/sound_core.c	2007-12-15 05:20:01.199908622 +0100
 @@ -174,9 +174,9 @@
  	}
  	
diff --git a/target/linux/generic-2.4/patches/224-atm_hotplug.patch b/target/linux/generic-2.4/patches/224-atm_hotplug.patch
index c431d8c6bc..97cb42c49f 100644
--- a/target/linux/generic-2.4/patches/224-atm_hotplug.patch
+++ b/target/linux/generic-2.4/patches/224-atm_hotplug.patch
@@ -1,7 +1,8 @@
-diff -urN linux.old/include/linux/atmdev.h linux.dev/include/linux/atmdev.h
---- linux.old/include/linux/atmdev.h	2005-11-17 12:51:55.883585000 +0100
-+++ linux.dev/include/linux/atmdev.h	2005-11-17 13:49:22.012671000 +0100
-@@ -408,6 +408,7 @@
+Index: linux-2.4.35.4/include/linux/atmdev.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/atmdev.h	2007-12-15 05:19:38.898637744 +0100
++++ linux-2.4.35.4/include/linux/atmdev.h	2007-12-15 05:20:02.816000717 +0100
+@@ -400,6 +400,7 @@
  struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops,
      int number,atm_dev_flags_t *flags); /* number == -1: pick first available */
  struct atm_dev *atm_dev_lookup(int number);
@@ -9,9 +10,10 @@ diff -urN linux.old/include/linux/atmdev.h linux.dev/include/linux/atmdev.h
  void atm_dev_deregister(struct atm_dev *dev);
  void shutdown_atm_dev(struct atm_dev *dev);
  void vcc_insert_socket(struct sock *sk);
-diff -urN linux.old/net/atm/resources.c linux.dev/net/atm/resources.c
---- linux.old/net/atm/resources.c	2003-11-28 19:26:21.000000000 +0100
-+++ linux.dev/net/atm/resources.c	2005-11-17 14:27:26.514267750 +0100
+Index: linux-2.4.35.4/net/atm/resources.c
+===================================================================
+--- linux-2.4.35.4.orig/net/atm/resources.c	2007-12-15 05:19:38.910638429 +0100
++++ linux-2.4.35.4/net/atm/resources.c	2007-12-15 05:20:02.824001175 +0100
 @@ -10,6 +10,7 @@
  #include <linux/sonet.h>
  #include <linux/kernel.h> /* for barrier */
diff --git a/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch b/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch
index b89f765173..0a4bd10065 100644
--- a/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch
+++ b/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch
@@ -1,6 +1,7 @@
-diff -ruN linux-2.4.32-old/lib/string.c linux-2.4.32-new/lib/string.c
---- linux-2.4.32-old/lib/string.c	2004-11-17 12:54:22.000000000 +0100
-+++ linux-2.4.32-new/lib/string.c	2006-01-17 14:41:17.000000000 +0100
+Index: linux-2.4.35.4/lib/string.c
+===================================================================
+--- linux-2.4.35.4.orig/lib/string.c	2007-12-15 05:19:38.866635920 +0100
++++ linux-2.4.35.4/lib/string.c	2007-12-15 05:20:03.080015763 +0100
 @@ -50,6 +50,7 @@
  	}
  	return (int)c1 - (int)c2;
diff --git a/target/linux/generic-2.4/patches/226-atm_br2684.patch b/target/linux/generic-2.4/patches/226-atm_br2684.patch
index 56f00155de..59289a1b30 100644
--- a/target/linux/generic-2.4/patches/226-atm_br2684.patch
+++ b/target/linux/generic-2.4/patches/226-atm_br2684.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.4.32/net/atm/br2684.c linux-2.4.32.new/net/atm/br2684.c
---- linux-2.4.32/net/atm/br2684.c	2004-08-08 01:26:06.000000000 +0200
-+++ linux-2.4.32.new/net/atm/br2684.c	2006-02-06 18:59:40.000000000 +0100
+Index: linux-2.4.35.4/net/atm/br2684.c
+===================================================================
+--- linux-2.4.35.4.orig/net/atm/br2684.c	2007-12-15 05:19:38.818633185 +0100
++++ linux-2.4.35.4/net/atm/br2684.c	2007-12-15 05:20:03.656048591 +0100
 @@ -55,36 +55,55 @@
  #define skb_debug(skb)	do {} while (0)
  #endif
@@ -485,9 +486,10 @@ diff -urN linux-2.4.32/net/atm/br2684.c linux-2.4.32.new/net/atm/br2684.c
  	while (!list_empty(&br2684_devs)) {
  		brdev = list_entry_brdev(br2684_devs.next);
  		unregister_netdev(&brdev->net_dev);
-diff -urN linux-2.4.32/net/atm/common.c linux-2.4.32.new/net/atm/common.c
---- linux-2.4.32/net/atm/common.c	2004-02-18 14:36:32.000000000 +0100
-+++ linux-2.4.32.new/net/atm/common.c	2006-02-06 17:26:52.000000000 +0100
+Index: linux-2.4.35.4/net/atm/common.c
+===================================================================
+--- linux-2.4.35.4.orig/net/atm/common.c	2007-12-15 05:19:38.826633641 +0100
++++ linux-2.4.35.4/net/atm/common.c	2007-12-15 05:20:03.656048591 +0100
 @@ -158,6 +158,7 @@
  }
  #ifdef CONFIG_ATM_BR2684_MODULE
@@ -496,8 +498,10 @@ diff -urN linux-2.4.32/net/atm/common.c linux-2.4.32.new/net/atm/common.c
  #endif
  #endif
  
---- linux-2.4.32/include/linux/atmbr2684.h	2002-08-03 02:39:45.000000000 +0200
-+++ linux-2.4.32.new/include/linux/atmbr2684.h	2006-02-06 19:01:24.000000000 +0100
+Index: linux-2.4.35.4/include/linux/atmbr2684.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/atmbr2684.h	2007-12-15 05:19:38.838634325 +0100
++++ linux-2.4.35.4/include/linux/atmbr2684.h	2007-12-15 05:20:03.668049273 +0100
 @@ -3,6 +3,7 @@
  
  #include <linux/atm.h>
diff --git a/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch b/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch
index fe97be5b3f..119f1d4d87 100644
--- a/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch
@@ -1,6 +1,7 @@
-diff -ur linux.old/fs/jffs2/build.c linux.dev/fs/jffs2/build.c
---- linux.old/fs/jffs2/build.c	2003-06-13 16:51:37.000000000 +0200
-+++ linux.dev/fs/jffs2/build.c	2006-06-23 22:15:21.000000000 +0200
+Index: linux-2.4.35.4/fs/jffs2/build.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/jffs2/build.c	2007-12-15 05:19:38.778630906 +0100
++++ linux-2.4.35.4/fs/jffs2/build.c	2007-12-15 05:20:03.936064549 +0100
 @@ -31,6 +31,10 @@
   * provisions above, a recipient may use your version of this file
   * under either the RHEPL or the GPL.
@@ -39,9 +40,10 @@ diff -ur linux.old/fs/jffs2/build.c linux.dev/fs/jffs2/build.c
  	D1(printk(KERN_DEBUG "Scanned flash completely\n"));
  	/* Now build the data map for each inode, marking obsoleted nodes
  	   as such, and also increase nlink of any children. */
-diff -ur linux.old/fs/jffs2/scan.c linux.dev/fs/jffs2/scan.c
---- linux.old/fs/jffs2/scan.c	2006-06-23 21:57:32.000000000 +0200
-+++ linux.dev/fs/jffs2/scan.c	2006-06-23 22:01:35.000000000 +0200
+Index: linux-2.4.35.4/fs/jffs2/scan.c
+===================================================================
+--- linux-2.4.35.4.orig/fs/jffs2/scan.c	2007-12-15 05:19:38.786631361 +0100
++++ linux-2.4.35.4/fs/jffs2/scan.c	2007-12-15 05:20:03.948065230 +0100
 @@ -31,6 +31,10 @@
   * provisions above, a recipient may use your version of this file
   * under either the RHEPL or the GPL.
diff --git a/target/linux/generic-2.4/patches/228-more_usb_fixes.patch b/target/linux/generic-2.4/patches/228-more_usb_fixes.patch
index f53a5247ca..6dc3931ca0 100644
--- a/target/linux/generic-2.4/patches/228-more_usb_fixes.patch
+++ b/target/linux/generic-2.4/patches/228-more_usb_fixes.patch
@@ -1,6 +1,7 @@
-diff -ur linux.old/drivers/scsi/hosts.c linux.dev/drivers/scsi/hosts.c
---- linux.old/drivers/scsi/hosts.c	2003-06-13 16:51:36.000000000 +0200
-+++ linux.dev/drivers/scsi/hosts.c	2006-07-30 12:34:30.000000000 +0200
+Index: linux-2.4.35.4/drivers/scsi/hosts.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/scsi/hosts.c	2007-12-15 05:19:38.686625662 +0100
++++ linux-2.4.35.4/drivers/scsi/hosts.c	2007-12-15 05:20:04.720109227 +0100
 @@ -107,8 +107,21 @@
      if (shn) shn->host_registered = 0;
      /* else {} : This should not happen, we should panic here... */
@@ -24,9 +25,10 @@ diff -ur linux.old/drivers/scsi/hosts.c linux.dev/drivers/scsi/hosts.c
      kfree((char *) sh);
  }
  
-diff -ur linux.old/drivers/usb/hcd.c linux.dev/drivers/usb/hcd.c
---- linux.old/drivers/usb/hcd.c	2004-04-14 15:05:32.000000000 +0200
-+++ linux.dev/drivers/usb/hcd.c	2006-07-30 11:49:06.000000000 +0200
+Index: linux-2.4.35.4/drivers/usb/hcd.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/hcd.c	2007-12-15 05:19:38.694626120 +0100
++++ linux-2.4.35.4/drivers/usb/hcd.c	2007-12-15 05:20:04.724109453 +0100
 @@ -1105,7 +1105,8 @@
  		break;
  	case PIPE_BULK:
@@ -47,9 +49,10 @@ diff -ur linux.old/drivers/usb/hcd.c linux.dev/drivers/usb/hcd.c
  			urb->transfer_dma = pci_map_single (
  					hcd->pdev,
  					urb->transfer_buffer,
-diff -ur linux.old/drivers/usb/host/ehci-hcd.c linux.dev/drivers/usb/host/ehci-hcd.c
---- linux.old/drivers/usb/host/ehci-hcd.c	2006-07-30 11:31:57.000000000 +0200
-+++ linux.dev/drivers/usb/host/ehci-hcd.c	2006-07-30 11:48:14.000000000 +0200
+Index: linux-2.4.35.4/drivers/usb/host/ehci-hcd.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/host/ehci-hcd.c	2007-12-15 05:19:38.702626576 +0100
++++ linux-2.4.35.4/drivers/usb/host/ehci-hcd.c	2007-12-15 05:20:04.728109682 +0100
 @@ -399,6 +399,27 @@
  		ehci_mem_cleanup (ehci);
  		return retval;
@@ -78,9 +81,10 @@ diff -ur linux.old/drivers/usb/host/ehci-hcd.c linux.dev/drivers/usb/host/ehci-h
  	writel (INTR_MASK, &ehci->regs->intr_enable);
  	writel (ehci->periodic_dma, &ehci->regs->frame_list);
  
-diff -ur linux.old/drivers/usb/host/ehci-q.c linux.dev/drivers/usb/host/ehci-q.c
---- linux.old/drivers/usb/host/ehci-q.c	2006-07-30 11:31:57.000000000 +0200
-+++ linux.dev/drivers/usb/host/ehci-q.c	2006-07-30 12:10:15.000000000 +0200
+Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c	2007-12-15 05:20:00.107846389 +0100
++++ linux-2.4.35.4/drivers/usb/host/ehci-q.c	2007-12-15 05:20:04.728109682 +0100
 @@ -791,6 +791,8 @@
  			writel (cmd, &ehci->regs->command);
  			ehci->hcd.state = USB_STATE_RUNNING;
@@ -90,9 +94,10 @@ diff -ur linux.old/drivers/usb/host/ehci-q.c linux.dev/drivers/usb/host/ehci-q.c
  		}
  	}
  
-diff -ur linux.old/drivers/usb/host/usb-uhci.c linux.dev/drivers/usb/host/usb-uhci.c
---- linux.old/drivers/usb/host/usb-uhci.c	2004-11-17 12:54:21.000000000 +0100
-+++ linux.dev/drivers/usb/host/usb-uhci.c	2006-07-30 12:10:16.000000000 +0200
+Index: linux-2.4.35.4/drivers/usb/host/usb-uhci.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/host/usb-uhci.c	2007-12-15 05:19:38.714627260 +0100
++++ linux-2.4.35.4/drivers/usb/host/usb-uhci.c	2007-12-15 05:20:04.728109682 +0100
 @@ -3034,6 +3034,21 @@
  	
  	pci_set_master(dev);
@@ -115,9 +120,10 @@ diff -ur linux.old/drivers/usb/host/usb-uhci.c linux.dev/drivers/usb/host/usb-uh
  	/* Search for the IO base address.. */
  	for (i = 0; i < 6; i++) {
  
-diff -ur linux.old/drivers/usb/storage/transport.c linux.dev/drivers/usb/storage/transport.c
---- linux.old/drivers/usb/storage/transport.c	2005-04-04 03:42:19.000000000 +0200
-+++ linux.dev/drivers/usb/storage/transport.c	2006-07-30 12:22:56.000000000 +0200
+Index: linux-2.4.35.4/drivers/usb/storage/transport.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/storage/transport.c	2007-12-15 05:19:38.722627715 +0100
++++ linux-2.4.35.4/drivers/usb/storage/transport.c	2007-12-15 05:20:04.732109911 +0100
 @@ -54,6 +54,22 @@
  #include <linux/sched.h>
  #include <linux/errno.h>
@@ -746,9 +752,10 @@ diff -ur linux.old/drivers/usb/storage/transport.c linux.dev/drivers/usb/storage
  		}
  	}
  	else
-diff -ur linux.old/drivers/usb/storage/transport.h linux.dev/drivers/usb/storage/transport.h
---- linux.old/drivers/usb/storage/transport.h	2003-08-25 13:44:42.000000000 +0200
-+++ linux.dev/drivers/usb/storage/transport.h	2006-07-30 12:10:16.000000000 +0200
+Index: linux-2.4.35.4/drivers/usb/storage/transport.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/storage/transport.h	2007-12-15 05:19:38.730628171 +0100
++++ linux-2.4.35.4/drivers/usb/storage/transport.h	2007-12-15 05:20:04.732109911 +0100
 @@ -127,6 +127,16 @@
  #define US_BULK_TRANSFER_ABORTED	3  /* transfer canceled             */
  
@@ -766,9 +773,10 @@ diff -ur linux.old/drivers/usb/storage/transport.h linux.dev/drivers/usb/storage
   * Transport return codes
   */
  
-diff -ur linux.old/drivers/usb/storage/usb.h linux.dev/drivers/usb/storage/usb.h
---- linux.old/drivers/usb/storage/usb.h	2005-04-04 03:42:20.000000000 +0200
-+++ linux.dev/drivers/usb/storage/usb.h	2006-07-30 12:11:06.000000000 +0200
+Index: linux-2.4.35.4/drivers/usb/storage/usb.h
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/storage/usb.h	2007-12-15 05:19:38.738628626 +0100
++++ linux-2.4.35.4/drivers/usb/storage/usb.h	2007-12-15 05:20:04.736110140 +0100
 @@ -111,6 +111,60 @@
  typedef void (*proto_cmnd)(Scsi_Cmnd*, struct us_data*);
  typedef void (*extra_data_destructor)(void *);	 /* extra data destructor   */
@@ -838,9 +846,10 @@ diff -ur linux.old/drivers/usb/storage/usb.h linux.dev/drivers/usb/storage/usb.h
  
  	/* the semaphore for sleeping the control thread */
  	struct semaphore	sema;		 /* to sleep thread on   */
-diff -ur linux.old/include/linux/usb.h linux.dev/include/linux/usb.h
---- linux.old/include/linux/usb.h	2004-11-17 12:54:22.000000000 +0100
-+++ linux.dev/include/linux/usb.h	2006-07-30 12:19:19.000000000 +0200
+Index: linux-2.4.35.4/include/linux/usb.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/usb.h	2007-12-15 05:19:38.750629310 +0100
++++ linux-2.4.35.4/include/linux/usb.h	2007-12-15 05:20:04.740110367 +0100
 @@ -483,6 +483,8 @@
  #define URB_NO_INTERRUPT	0x0080	/* HINT: no non-error interrupt needed */
  					/* ... less overhead for QUEUE_BULK */
diff --git a/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch b/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch
index 636ffec11d..a671d1a271 100644
--- a/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch
+++ b/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch
@@ -1,56 +1,8 @@
---- linux-2.4.32/drivers/net/tun.c 2006-10-28 18:21:45.000000000 +0100
-+++ new.linux-2.4.32/drivers/net/tun.c 2006-10-28 18:50:53.000000000 +0100
-@@ -185,22 +185,31 @@
- {
- 	struct tun_pi pi = { 0, __constant_htons(ETH_P_IP) };
- 	struct sk_buff *skb;
--	size_t len = count;
-+	size_t len = count, align = 0;
- 
- 	if (!(tun->flags & TUN_NO_PI)) {
- 		if ((len -= sizeof(pi)) > count)
- 			return -EINVAL;
- 
--		memcpy_fromiovec((void *)&pi, iv, sizeof(pi));
-+ 		if(memcpy_fromiovec((void *)&pi, iv, sizeof(pi)))
-+ 			return -EFAULT;
- 	}
-- 
--	if (!(skb = alloc_skb(len + 2, GFP_KERNEL))) {
-+
-+	if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV)
-+		align = NET_IP_ALIGN;
-+  
-+	if (!(skb = alloc_skb(len + align, GFP_KERNEL))) {
- 		tun->stats.rx_dropped++;
- 		return -ENOMEM;
- 	}
- 
--	skb_reserve(skb, 2);
--	memcpy_fromiovec(skb_put(skb, len), iv, len);
-+	if (align)
-+		skb_reserve(skb, align);
-+ 	if (memcpy_fromiovec(skb_put(skb, len), iv, len)) {
-+		tun->stats.rx_dropped++;
-+		kfree_skb(skb);
-+ 		return -EFAULT;
-+	}
- 
- 	skb->dev = &tun->dev;
- 	switch (tun->flags & TUN_TYPE_MASK) {
-@@ -271,7 +271,8 @@
- 			pi.flags |= TUN_PKT_STRIP;
- 		}
-  
--		memcpy_toiovec(iv, (void *) &pi, sizeof(pi));
-+		if(memcpy_toiovec(iv, (void *) &pi, sizeof(pi)))
-+			return -EFAULT;
- 		total += sizeof(pi);
- 	}       
- 
---- linux-2.4.32/include/linux/skbuff.h	2006-10-28 19:31:31.000000000 +0100
-+++ new.linux-2.4.32/include/linux/skbuff.h	2006-10-28 19:29:27.000000000 +0100
-@@ -918,6 +918,49 @@
+Index: linux-2.4.35.4/include/linux/skbuff.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/skbuff.h	2007-12-15 05:19:38.654623841 +0100
++++ linux-2.4.35.4/include/linux/skbuff.h	2007-12-15 05:20:05.060128604 +0100
+@@ -912,6 +912,49 @@
  	skb->tail+=len;
  }
  
@@ -100,3 +52,55 @@
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len, int realloc);
  
  static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
+Index: linux-2.4.35.4/drivers/net/tun.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/tun.c	2007-12-15 05:19:38.642623156 +0100
++++ linux-2.4.35.4/drivers/net/tun.c	2007-12-15 05:20:05.056128377 +0100
+@@ -185,22 +185,31 @@
+ {
+ 	struct tun_pi pi = { 0, __constant_htons(ETH_P_IP) };
+ 	struct sk_buff *skb;
+-	size_t len = count;
++	size_t len = count, align = 0;
+ 
+ 	if (!(tun->flags & TUN_NO_PI)) {
+ 		if ((len -= sizeof(pi)) > count)
+ 			return -EINVAL;
+ 
+-		memcpy_fromiovec((void *)&pi, iv, sizeof(pi));
++ 		if(memcpy_fromiovec((void *)&pi, iv, sizeof(pi)))
++ 			return -EFAULT;
+ 	}
+- 
+-	if (!(skb = alloc_skb(len + 2, GFP_KERNEL))) {
++
++	if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV)
++		align = NET_IP_ALIGN;
++  
++	if (!(skb = alloc_skb(len + align, GFP_KERNEL))) {
+ 		tun->stats.rx_dropped++;
+ 		return -ENOMEM;
+ 	}
+ 
+-	skb_reserve(skb, 2);
+-	memcpy_fromiovec(skb_put(skb, len), iv, len);
++	if (align)
++		skb_reserve(skb, align);
++ 	if (memcpy_fromiovec(skb_put(skb, len), iv, len)) {
++		tun->stats.rx_dropped++;
++		kfree_skb(skb);
++ 		return -EFAULT;
++	}
+ 
+ 	skb->dev = &tun->dev;
+ 	switch (tun->flags & TUN_TYPE_MASK) {
+@@ -271,7 +280,8 @@
+ 			pi.flags |= TUN_PKT_STRIP;
+ 		}
+  
+-		memcpy_toiovec(iv, (void *) &pi, sizeof(pi));
++		if(memcpy_toiovec(iv, (void *) &pi, sizeof(pi)))
++			return -EFAULT;
+ 		total += sizeof(pi);
+ 	}       
+ 
diff --git a/target/linux/generic-2.4/patches/231-mini_fo.patch b/target/linux/generic-2.4/patches/231-mini_fo.patch
index 29de3ead67..018762a971 100644
--- a/target/linux/generic-2.4/patches/231-mini_fo.patch
+++ b/target/linux/generic-2.4/patches/231-mini_fo.patch
@@ -1,7 +1,8 @@
-diff -urN linux.old/fs/Config.in linux.dev/fs/Config.in
---- linux.old/fs/Config.in	2006-10-30 03:44:06.000000000 +0100
-+++ linux.dev/fs/Config.in	2006-10-30 03:42:09.000000000 +0100
-@@ -70,6 +70,7 @@
+Index: linux-2.4.35.4/fs/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/fs/Config.in	2007-12-15 05:19:52.319402550 +0100
++++ linux-2.4.35.4/fs/Config.in	2007-12-15 05:20:05.284141367 +0100
+@@ -77,6 +77,7 @@
  dep_mbool '  JFS statistics' CONFIG_JFS_STATISTICS $CONFIG_JFS_FS
  
  tristate 'Minix fs support' CONFIG_MINIX_FS
@@ -9,9 +10,10 @@ diff -urN linux.old/fs/Config.in linux.dev/fs/Config.in
  
  tristate 'FreeVxFS file system support (VERITAS VxFS(TM) compatible)' CONFIG_VXFS_FS
  tristate 'NTFS file system support (read only)' CONFIG_NTFS_FS
-diff -urN linux.old/fs/Makefile linux.dev/fs/Makefile
---- linux.old/fs/Makefile	2006-10-30 03:44:06.000000000 +0100
-+++ linux.dev/fs/Makefile	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/fs/Makefile	2007-12-15 05:19:52.319402550 +0100
++++ linux-2.4.35.4/fs/Makefile	2007-12-15 05:20:05.288141596 +0100
 @@ -31,6 +31,7 @@
  subdir-$(CONFIG_CODA_FS)	+= coda
  subdir-$(CONFIG_INTERMEZZO_FS)	+= intermezzo
@@ -20,9 +22,10 @@ diff -urN linux.old/fs/Makefile linux.dev/fs/Makefile
  subdir-$(CONFIG_FAT_FS)		+= fat
  subdir-$(CONFIG_UMSDOS_FS)	+= umsdos
  subdir-$(CONFIG_MSDOS_FS)	+= msdos
-diff -urN linux.old/fs/mini_fo/aux.c linux.dev/fs/mini_fo/aux.c
---- linux.old/fs/mini_fo/aux.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/aux.c	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/aux.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/aux.c	2007-12-15 05:20:05.296142055 +0100
 @@ -0,0 +1,580 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -604,9 +607,10 @@ diff -urN linux.old/fs/mini_fo/aux.c linux.dev/fs/mini_fo/aux.c
 +
 +#endif /* unused */
 +
-diff -urN linux.old/fs/mini_fo/ChangeLog linux.dev/fs/mini_fo/ChangeLog
---- linux.old/fs/mini_fo/ChangeLog	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/ChangeLog	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/ChangeLog
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/ChangeLog	2007-12-15 05:20:05.296142055 +0100
 @@ -0,0 +1,281 @@
 +2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
 +
@@ -889,9 +893,10 @@ diff -urN linux.old/fs/mini_fo/ChangeLog linux.dev/fs/mini_fo/ChangeLog
 +	* Implementation of mini_fo_mknod and mini_fo_rename, support
 +          for device files.
 +	
-diff -urN linux.old/fs/mini_fo/dentry.c linux.dev/fs/mini_fo/dentry.c
---- linux.old/fs/mini_fo/dentry.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/dentry.c	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/dentry.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/dentry.c	2007-12-15 05:20:05.296142055 +0100
 @@ -0,0 +1,244 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -1137,9 +1142,10 @@ diff -urN linux.old/fs/mini_fo/dentry.c linux.dev/fs/mini_fo/dentry.c
 +	d_delete:		mini_fo_d_delete,
 +	d_iput:		mini_fo_d_iput,
 +};
-diff -urN linux.old/fs/mini_fo/file.c linux.dev/fs/mini_fo/file.c
---- linux.old/fs/mini_fo/file.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/file.c	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/file.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/file.c	2007-12-15 05:20:05.300142281 +0100
 @@ -0,0 +1,717 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -1858,9 +1864,10 @@ diff -urN linux.old/fs/mini_fo/file.c linux.dev/fs/mini_fo/file.c
 +		/* not implemented: sendpage */
 +		/* not implemented: get_unmapped_area */
 +	};
-diff -urN linux.old/fs/mini_fo/fist.h linux.dev/fs/mini_fo/fist.h
---- linux.old/fs/mini_fo/fist.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/fist.h	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/fist.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/fist.h	2007-12-15 05:20:05.300142281 +0100
 @@ -0,0 +1,248 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -2110,9 +2117,10 @@ diff -urN linux.old/fs/mini_fo/fist.h linux.dev/fs/mini_fo/fist.h
 +# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
 +
 +#endif /* not __FIST_H_ */
-diff -urN linux.old/fs/mini_fo/inode.c linux.dev/fs/mini_fo/inode.c
---- linux.old/fs/mini_fo/inode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/inode.c	2006-10-30 03:55:42.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/inode.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/inode.c	2007-12-15 05:20:05.300142281 +0100
 @@ -0,0 +1,1573 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -3687,9 +3695,10 @@ diff -urN linux.old/fs/mini_fo/inode.c linux.dev/fs/mini_fo/inode.c
 +		removexattr:    mini_fo_removexattr
 +# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
 +	};
-diff -urN linux.old/fs/mini_fo/main.c linux.dev/fs/mini_fo/main.c
---- linux.old/fs/mini_fo/main.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/main.c	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/main.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/main.c	2007-12-15 05:20:05.300142281 +0100
 @@ -0,0 +1,414 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -4105,9 +4114,10 @@ diff -urN linux.old/fs/mini_fo/main.c linux.dev/fs/mini_fo/main.c
 +
 +module_init(init_mini_fo_fs)
 +module_exit(exit_mini_fo_fs)
-diff -urN linux.old/fs/mini_fo/Makefile linux.dev/fs/mini_fo/Makefile
---- linux.old/fs/mini_fo/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/Makefile	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/Makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/Makefile	2007-12-15 05:20:05.304142507 +0100
 @@ -0,0 +1,22 @@
 +#
 +# Makefile for mini_fo 2.4 and 2.6 Linux kernels
@@ -4131,9 +4141,10 @@ diff -urN linux.old/fs/mini_fo/Makefile linux.dev/fs/mini_fo/Makefile
 +# dependencies
 +${mini_fo-objs}: mini_fo.h fist.h
 +
-diff -urN linux.old/fs/mini_fo/meta.c linux.dev/fs/mini_fo/meta.c
---- linux.old/fs/mini_fo/meta.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/meta.c	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/meta.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/meta.c	2007-12-15 05:20:05.304142507 +0100
 @@ -0,0 +1,1000 @@
 +/*
 + * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
@@ -5135,9 +5146,10 @@ diff -urN linux.old/fs/mini_fo/meta.c linux.dev/fs/mini_fo/meta.c
 +	return 0;
 +}
 +
-diff -urN linux.old/fs/mini_fo/mini_fo.h linux.dev/fs/mini_fo/mini_fo.h
---- linux.old/fs/mini_fo/mini_fo.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/mini_fo.h	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/mini_fo.h	2007-12-15 05:20:05.304142507 +0100
 @@ -0,0 +1,503 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -5642,9 +5654,10 @@ diff -urN linux.old/fs/mini_fo/mini_fo.h linux.dev/fs/mini_fo/mini_fo.h
 +/* ioctls */
 +
 +#endif	/* not __MINI_FO_H_ */
-diff -urN linux.old/fs/mini_fo/mini_fo-merge linux.dev/fs/mini_fo/mini_fo-merge
---- linux.old/fs/mini_fo/mini_fo-merge	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/mini_fo-merge	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/mini_fo-merge	2007-12-15 05:20:05.304142507 +0100
 @@ -0,0 +1,180 @@
 +#!/bin/bash
 +#
@@ -5826,9 +5839,10 @@ diff -urN linux.old/fs/mini_fo/mini_fo-merge linux.dev/fs/mini_fo/mini_fo-merge
 +#rm $TMP/$SKIP_DEL_LIST 
 +
 +echo "Done!"
-diff -urN linux.old/fs/mini_fo/mini_fo-overlay linux.dev/fs/mini_fo/mini_fo-overlay
---- linux.old/fs/mini_fo/mini_fo-overlay	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/mini_fo-overlay	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/mini_fo-overlay	2007-12-15 05:20:05.308142736 +0100
 @@ -0,0 +1,130 @@
 +#!/bin/bash
 +#
@@ -5960,9 +5974,10 @@ diff -urN linux.old/fs/mini_fo/mini_fo-overlay linux.dev/fs/mini_fo/mini_fo-over
 +if [ $? -ne 0 ]; then
 +    echo "Error, mounting failed, maybe no permisson to mount?"
 +fi
-diff -urN linux.old/fs/mini_fo/mmap.c linux.dev/fs/mini_fo/mmap.c
---- linux.old/fs/mini_fo/mmap.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/mmap.c	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/mmap.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/mmap.c	2007-12-15 05:20:05.316143195 +0100
 @@ -0,0 +1,637 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
@@ -6601,9 +6616,10 @@ diff -urN linux.old/fs/mini_fo/mmap.c linux.dev/fs/mini_fo/mmap.c
 +	print_exit_status(err);
 +	return err;
 +}
-diff -urN linux.old/fs/mini_fo/README linux.dev/fs/mini_fo/README
---- linux.old/fs/mini_fo/README	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/README	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/README
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/README	2007-12-15 05:20:05.316143195 +0100
 @@ -0,0 +1,163 @@
 +README for the mini_fo overlay file system
 +=========================================
@@ -6768,9 +6784,10 @@ diff -urN linux.old/fs/mini_fo/README linux.dev/fs/mini_fo/README
 +2 of the License, or (at your option) any later version.
 +
 +
-diff -urN linux.old/fs/mini_fo/RELEASE_NOTES linux.dev/fs/mini_fo/RELEASE_NOTES
---- linux.old/fs/mini_fo/RELEASE_NOTES	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/RELEASE_NOTES	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES	2007-12-15 05:20:05.316143195 +0100
 @@ -0,0 +1,111 @@
 +Release:	mini_fo-0.6.1 (v0-6-1)
 +Date:		21.09.2005
@@ -6883,9 +6900,10 @@ diff -urN linux.old/fs/mini_fo/RELEASE_NOTES linux.dev/fs/mini_fo/RELEASE_NOTES
 +original state. I hope to fix this someday. Please note that this does
 +not effect the special hard links '.' and '..', that are handled
 +seperately by the lower fs.
-diff -urN linux.old/fs/mini_fo/state.c linux.dev/fs/mini_fo/state.c
---- linux.old/fs/mini_fo/state.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/state.c	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/state.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/state.c	2007-12-15 05:20:05.316143195 +0100
 @@ -0,0 +1,620 @@
 +/*
 + * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
@@ -7507,9 +7525,10 @@ diff -urN linux.old/fs/mini_fo/state.c linux.dev/fs/mini_fo/state.c
 +	return err;
 +}
 +
-diff -urN linux.old/fs/mini_fo/super.c linux.dev/fs/mini_fo/super.c
---- linux.old/fs/mini_fo/super.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/fs/mini_fo/super.c	2006-10-30 03:42:09.000000000 +0100
+Index: linux-2.4.35.4/fs/mini_fo/super.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/fs/mini_fo/super.c	2007-12-15 05:20:05.316143195 +0100
 @@ -0,0 +1,259 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
diff --git a/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch b/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch
index bfaa6e4b76..c2b5199630 100644
--- a/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch
+++ b/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch
@@ -1,6 +1,7 @@
-diff -urN linux.old/include/linux/netfilter_ipv4/ipt_ipp2p.h linux.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h
---- linux.old/include/linux/netfilter_ipv4/ipt_ipp2p.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/linux/netfilter_ipv4/ipt_ipp2p.h	2006-03-23 14:37:56.000000000 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h	2007-12-15 05:20:05.756168270 +0100
 @@ -0,0 +1,31 @@
 +#ifndef __IPT_IPP2P_H
 +#define __IPT_IPP2P_H
@@ -33,10 +34,11 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ipt_ipp2p.h linux.dev/include/l
 +#define IPP2P_MUTE		(1 << 14)
 +#define IPP2P_WASTE		(1 << 15)
 +#define IPP2P_XDCC		(1 << 16)
-diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Config.in
---- linux.old/net/ipv4/netfilter/Config.in	2006-03-23 14:35:20.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/Config.in	2006-03-23 14:35:58.000000000 +0100
-@@ -29,6 +29,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:19:38.466613124 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:05.764168722 +0100
+@@ -26,6 +26,7 @@
    dep_tristate '  TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
    dep_tristate '  recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
    dep_tristate '  ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES
@@ -44,10 +46,11 @@ diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Co
   
    dep_tristate '  DSCP match support' CONFIG_IP_NF_MATCH_DSCP $CONFIG_IP_NF_IPTABLES
   
-diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Makefile
---- linux.old/net/ipv4/netfilter/Makefile	2006-03-23 14:35:20.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/Makefile	2006-03-23 14:35:58.000000000 +0100
-@@ -76,6 +76,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:19:38.474613582 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:05.764168722 +0100
+@@ -67,6 +67,7 @@
  obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
  obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
  obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o
@@ -55,9 +58,10 @@ diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Mak
  
  obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o
  obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
-diff -urN linux.old/net/ipv4/netfilter/ipt_ipp2p.c linux.dev/net/ipv4/netfilter/ipt_ipp2p.c
---- linux.old/net/ipv4/netfilter/ipt_ipp2p.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/ipt_ipp2p.c	2006-03-23 14:37:18.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c	2007-12-15 05:20:05.764168722 +0100
 @@ -0,0 +1,868 @@
 +#if defined(MODVERSIONS)
 +#include <linux/modversions.h>
diff --git a/target/linux/generic-2.4/patches/602-netfilter_layer7_2.1nbd.patch b/target/linux/generic-2.4/patches/602-netfilter_layer7_2.1nbd.patch
index d67725d854..301a3a79f2 100644
--- a/target/linux/generic-2.4/patches/602-netfilter_layer7_2.1nbd.patch
+++ b/target/linux/generic-2.4/patches/602-netfilter_layer7_2.1nbd.patch
@@ -1,7 +1,8 @@
-diff -urN linux.old/Documentation/Configure.help linux.dev/Documentation/Configure.help
---- linux.old/Documentation/Configure.help	2006-01-31 16:55:22.467939000 +0100
-+++ linux.dev/Documentation/Configure.help	2006-01-31 16:58:24.751331500 +0100
-@@ -29151,6 +29151,18 @@
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:19:54.063501941 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:20:06.024183543 +0100
+@@ -29207,6 +29207,18 @@
    
    If unsure, say N.
  
@@ -20,9 +21,10 @@ diff -urN linux.old/Documentation/Configure.help linux.dev/Documentation/Configu
  #
  # A couple of things I keep forgetting:
  #   capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet,
-diff -urN linux.old/include/linux/netfilter_ipv4/ip_conntrack.h linux.dev/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux.old/include/linux/netfilter_ipv4/ip_conntrack.h	2005-11-16 20:12:54.000000000 +0100
-+++ linux.dev/include/linux/netfilter_ipv4/ip_conntrack.h	2006-01-31 16:58:24.775333000 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:19:38.358606970 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:06.024183543 +0100
 @@ -207,6 +207,17 @@
  	} nat;
  #endif /* CONFIG_IP_NF_NAT_NEEDED */
@@ -41,9 +43,10 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ip_conntrack.h linux.dev/includ
  };
  
  /* get master conntrack via master expectation */
-diff -urN linux.old/include/linux/netfilter_ipv4/ipt_layer7.h linux.dev/include/linux/netfilter_ipv4/ipt_layer7.h
---- linux.old/include/linux/netfilter_ipv4/ipt_layer7.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/linux/netfilter_ipv4/ipt_layer7.h	2006-01-31 19:29:03.774017500 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h	2007-12-15 05:20:06.032183998 +0100
 @@ -0,0 +1,27 @@
 +/* 
 +  By Matthew Strait <quadong@users.sf.net>, Dec 2003.
@@ -72,9 +75,10 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ipt_layer7.h linux.dev/include/
 +};
 +
 +#endif /* _IPT_LAYER7_H */
-diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Config.in
---- linux.old/net/ipv4/netfilter/Config.in	2006-01-31 16:55:32.364558000 +0100
-+++ linux.dev/net/ipv4/netfilter/Config.in	2006-01-31 16:58:24.803334750 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:05.764168722 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:06.036184227 +0100
 @@ -44,6 +44,9 @@
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
      dep_tristate '  Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES
@@ -85,9 +89,10 @@ diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Co
    fi
  # The targets
    dep_tristate '  Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES 
-diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Makefile
---- linux.old/net/ipv4/netfilter/Makefile	2006-01-31 16:55:32.372558000 +0100
-+++ linux.dev/net/ipv4/netfilter/Makefile	2006-01-31 16:58:24.803334750 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:05.764168722 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:06.036184227 +0100
 @@ -87,6 +87,7 @@
  obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
  obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
@@ -96,9 +101,10 @@ diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Mak
  
  # targets
  obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
-diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_core.c linux.dev/net/ipv4/netfilter/ip_conntrack_core.c
---- linux.old/net/ipv4/netfilter/ip_conntrack_core.c	2005-04-04 03:42:20.000000000 +0200
-+++ linux.dev/net/ipv4/netfilter/ip_conntrack_core.c	2006-01-31 16:58:24.811335250 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c	2007-12-15 05:19:38.386608565 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c	2007-12-15 05:20:06.036184227 +0100
 @@ -346,6 +346,14 @@
  		}
  		kfree(ct->master);
@@ -114,9 +120,10 @@ diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_core.c linux.dev/net/ipv4/ne
  	WRITE_UNLOCK(&ip_conntrack_lock);
  
  	if (master)
-diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c linux.dev/net/ipv4/netfilter/ip_conntrack_standalone.c
---- linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c	2005-04-04 03:42:20.000000000 +0200
-+++ linux.dev/net/ipv4/netfilter/ip_conntrack_standalone.c	2006-01-31 16:58:24.815335500 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c	2007-12-15 05:19:38.394609023 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c	2007-12-15 05:20:06.036184227 +0100
 @@ -107,6 +107,13 @@
  		len += sprintf(buffer + len, "[ASSURED] ");
  	len += sprintf(buffer + len, "use=%u ",
@@ -131,9 +138,10 @@ diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c linux.dev/net/i
  	len += sprintf(buffer + len, "\n");
  
  	return len;
-diff -urN linux.old/net/ipv4/netfilter/ipt_layer7.c linux.dev/net/ipv4/netfilter/ipt_layer7.c
---- linux.old/net/ipv4/netfilter/ipt_layer7.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/ipt_layer7.c	2006-01-31 19:31:38.591693000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c	2007-12-15 05:20:06.040184453 +0100
 @@ -0,0 +1,595 @@
 +/* 
 +  Kernel module to match application layer (OSI layer 7) 
@@ -730,9 +738,10 @@ diff -urN linux.old/net/ipv4/netfilter/ipt_layer7.c linux.dev/net/ipv4/netfilter
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.c linux.dev/net/ipv4/netfilter/regexp/regexp.c
---- linux.old/net/ipv4/netfilter/regexp/regexp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/regexp/regexp.c	2006-01-31 16:58:24.819335750 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c	2007-12-15 05:20:06.040184453 +0100
 @@ -0,0 +1,1195 @@
 +/*
 + * regcomp and regexec -- regsub and regerror are elsewhere
@@ -1929,9 +1938,10 @@ diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.c linux.dev/net/ipv4/netfil
 +#endif
 +
 +
-diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.h linux.dev/net/ipv4/netfilter/regexp/regexp.h
---- linux.old/net/ipv4/netfilter/regexp/regexp.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/regexp/regexp.h	2006-01-31 16:58:24.819335750 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h	2007-12-15 05:20:06.040184453 +0100
 @@ -0,0 +1,40 @@
 +/*
 + * Definitions etc. for regexp(3) routines.
@@ -1973,18 +1983,20 @@ diff -urN linux.old/net/ipv4/netfilter/regexp/regexp.h linux.dev/net/ipv4/netfil
 +void regerror(char *s);
 +
 +#endif
-diff -urN linux.old/net/ipv4/netfilter/regexp/regmagic.h linux.dev/net/ipv4/netfilter/regexp/regmagic.h
---- linux.old/net/ipv4/netfilter/regexp/regmagic.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/regexp/regmagic.h	2006-01-31 16:58:24.823336000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h	2007-12-15 05:20:06.040184453 +0100
 @@ -0,0 +1,5 @@
 +/*
 + * The first byte of the regexp internal "program" is actually this magic
 + * number; the start node begins in the second byte.
 + */
 +#define	MAGIC	0234
-diff -urN linux.old/net/ipv4/netfilter/regexp/regsub.c linux.dev/net/ipv4/netfilter/regexp/regsub.c
---- linux.old/net/ipv4/netfilter/regexp/regsub.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/regexp/regsub.c	2006-01-31 16:58:24.823336000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c	2007-12-15 05:20:06.044184683 +0100
 @@ -0,0 +1,95 @@
 +/*
 + * regsub
diff --git a/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch b/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch
index fb5c314e6b..dd1bc1ca5e 100644
--- a/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch
+++ b/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack.h	2005-04-02 19:04:11.000000000 +0200
-+++ linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack.h	2005-04-02 19:41:05.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:06.024183543 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:06.392204515 +0100
 @@ -50,16 +50,19 @@
  
  #include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
@@ -55,9 +56,10 @@ diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4
  };
  #endif
  
-diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_pptp.h linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
---- linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_pptp.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_pptp.h	2005-04-02 19:09:07.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h	2007-12-15 05:20:06.400204969 +0100
 @@ -0,0 +1,313 @@
 +/* PPTP constants and structs */
 +#ifndef _CONNTRACK_PPTP_H
@@ -372,9 +374,10 @@ diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_pptp.h linu
 +
 +#endif /* __KERNEL__ */
 +#endif /* _CONNTRACK_PPTP_H */
-diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
---- linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h	2005-04-02 19:10:45.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h	2007-12-15 05:20:06.400204969 +0100
 @@ -0,0 +1,123 @@
 +#ifndef _CONNTRACK_PROTO_GRE_H
 +#define _CONNTRACK_PROTO_GRE_H
@@ -499,9 +502,10 @@ diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* _CONNTRACK_PROTO_GRE_H */
-diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
---- linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2003-11-28 19:26:21.000000000 +0100
-+++ linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2005-04-02 19:07:18.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2007-12-15 05:19:38.250600816 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2007-12-15 05:20:06.400204969 +0100
 @@ -14,7 +14,7 @@
  union ip_conntrack_manip_proto
  {
@@ -560,9 +564,10 @@ diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_tuple.h lin
  
  #define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL)
  
-diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_nat_pptp.h linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_nat_pptp.h
---- linux-2.4.29-old/include/linux/netfilter_ipv4/ip_nat_pptp.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_nat_pptp.h	2005-04-02 19:07:18.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h	2007-12-15 05:20:06.400204969 +0100
 @@ -0,0 +1,11 @@
 +/* PPTP constants and structs */
 +#ifndef _NAT_PPTP_H
@@ -575,9 +580,10 @@ diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_nat_pptp.h linux-2.4.
 +};
 +
 +#endif /* _NAT_PPTP_H */
-diff -urN linux-2.4.29-old/net/ipv4/netfilter/Config.in linux-2.4.29-dev/net/ipv4/netfilter/Config.in
---- linux-2.4.29-old/net/ipv4/netfilter/Config.in	2005-04-02 19:04:11.000000000 +0200
-+++ linux-2.4.29-dev/net/ipv4/netfilter/Config.in	2005-04-02 19:07:18.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:06.036184227 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:06.400204969 +0100
 @@ -10,6 +10,8 @@
    dep_tristate '  Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK
    dep_tristate '  TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
@@ -587,7 +593,7 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/Config.in linux-2.4.29-dev/net/ipv
  fi
  
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-@@ -67,6 +69,20 @@
+@@ -63,6 +65,20 @@
        define_bool CONFIG_IP_NF_NAT_NEEDED y
        dep_tristate '    MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT
        dep_tristate '    REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT
@@ -608,10 +614,11 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/Config.in linux-2.4.29-dev/net/ipv
        if [ "$CONFIG_IP_NF_AMANDA" = "m" ]; then
          define_tristate CONFIG_IP_NF_NAT_AMANDA m
        else
-diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_core.c
---- linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_core.c	2005-04-02 19:04:11.000000000 +0200
-+++ linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_core.c	2005-04-02 19:07:18.000000000 +0200
-@@ -142,6 +142,8 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c	2007-12-15 05:20:06.036184227 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c	2007-12-15 05:20:06.404205198 +0100
+@@ -143,6 +143,8 @@
  	tuple->dst.ip = iph->daddr;
  	tuple->dst.protonum = iph->protocol;
  
@@ -620,7 +627,7 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.29-d
  	ret = protocol->pkt_to_tuple((u_int32_t *)iph + iph->ihl,
  				     len - 4*iph->ihl,
  				     tuple);
-@@ -157,6 +159,8 @@
+@@ -158,6 +160,8 @@
  	inverse->dst.ip = orig->src.ip;
  	inverse->dst.protonum = orig->dst.protonum;
  
@@ -629,7 +636,7 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.29-d
  	return protocol->invert_tuple(inverse, orig);
  }
  
-@@ -954,8 +958,8 @@
+@@ -970,8 +974,8 @@
  	 * so there is no need to use the tuple lock too */
  
  	DEBUGP("ip_conntrack_expect_related %p\n", related_to);
@@ -640,7 +647,7 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.29-d
  
  	old = LIST_FIND(&ip_conntrack_expect_list, resent_expect,
  		        struct ip_conntrack_expect *, &expect->tuple, 
-@@ -1072,15 +1076,14 @@
+@@ -1089,15 +1093,14 @@
  
  	MUST_BE_READ_LOCKED(&ip_conntrack_lock);
  	WRITE_LOCK(&ip_conntrack_expect_tuple_lock);
@@ -660,9 +667,10 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.29-d
  		    && LIST_FIND(&ip_conntrack_expect_list, expect_clash,
  			         struct ip_conntrack_expect *, newtuple, &expect->mask)) {
  			/* Force NAT to find an unused tuple */
-diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_pptp_priv.h linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
---- linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_pptp_priv.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_pptp_priv.h	2005-04-02 19:14:10.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h	2007-12-15 05:20:06.404205198 +0100
 @@ -0,0 +1,24 @@
 +#ifndef _IP_CT_PPTP_PRIV_H
 +#define _IP_CT_PPTP_PRIV_H
@@ -688,9 +696,10 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_pptp_priv.h linux-2.4
 +};
 +
 +#endif
-diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_proto_gre.c linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_proto_gre.c
---- linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_proto_gre.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_proto_gre.c	2005-04-02 19:14:31.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c	2007-12-15 05:20:06.404205198 +0100
 @@ -0,0 +1,333 @@
 +/*
 + * ip_conntrack_proto_gre.c - Version 1.2 
@@ -1025,9 +1034,10 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_proto_gre.c linux-2.4
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_core.c linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_core.c
---- linux-2.4.29-old/net/ipv4/netfilter/ip_nat_core.c	2005-01-19 15:10:13.000000000 +0100
-+++ linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_core.c	2005-04-02 19:07:18.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_core.c	2007-12-15 05:19:38.290603095 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c	2007-12-15 05:20:06.404205198 +0100
 @@ -424,7 +424,7 @@
  	*tuple = *orig_tuple;
  	while ((rptr = find_best_ips_proto_fast(tuple, mr, conntrack, hooknum))
@@ -1049,9 +1059,10 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_core.c linux-2.4.29-dev/net
  #endif
  
  		/* We now have two tuples (SRCIP/SRCPT/DSTIP/DSTPT):
-diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_pptp.c linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_pptp.c
---- linux-2.4.29-old/net/ipv4/netfilter/ip_nat_pptp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_pptp.c	2005-04-02 19:14:52.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c	2007-12-15 05:20:06.408205428 +0100
 @@ -0,0 +1,482 @@
 +/*
 + * ip_nat_pptp.c	- Version 1.5
@@ -1535,9 +1546,10 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_pptp.c linux-2.4.29-dev/net
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_proto_gre.c linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_proto_gre.c
---- linux-2.4.29-old/net/ipv4/netfilter/ip_nat_proto_gre.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_proto_gre.c	2005-04-02 19:15:10.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c	2007-12-15 05:20:06.408205428 +0100
 @@ -0,0 +1,202 @@
 +/*
 + * ip_nat_proto_gre.c - Version 1.2
@@ -1741,9 +1753,10 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_proto_gre.c linux-2.4.29-de
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.29-old/net/ipv4/netfilter/Makefile linux-2.4.29-dev/net/ipv4/netfilter/Makefile
---- linux-2.4.29-old/net/ipv4/netfilter/Makefile	2005-04-02 19:04:11.000000000 +0200
-+++ linux-2.4.29-dev/net/ipv4/netfilter/Makefile	2005-04-02 19:07:18.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:06.036184227 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:06.408205428 +0100
 @@ -36,23 +36,32 @@
  ifdef CONFIG_IP_NF_AMANDA
  	export-objs += ip_conntrack_amanda.o
@@ -1779,8 +1792,10 @@ diff -urN linux-2.4.29-old/net/ipv4/netfilter/Makefile linux-2.4.29-dev/net/ipv4
  
  # generic IP tables 
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
---- linux-2.4.32/net/ipv4/netfilter/ip_conntrack_pptp.c	1970-01-01 01:00:00.000000000 +0100
-+++ /home/florian//openwrt/trunk/openwrt/build_mipsel/linux/net/ipv4/netfilter/ip_conntrack_pptp.c	2006-02-04 18:23:27.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c	2007-12-15 05:20:06.408205428 +0100
 @@ -0,0 +1,635 @@
 +/*
 + * ip_conntrack_pptp.c	- Version 1.9
diff --git a/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch b/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch
index 001ed67b88..d0b3816557 100644
--- a/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch
+++ b/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch
@@ -1,6 +1,8 @@
---- ../../buildroot-unpacked/build_mipsel/linux/net/ipv4/netfilter/ip_conntrack_core.c	2004-11-28 22:59:36.000000000 -0500
-+++ linux/net/ipv4/netfilter/ip_conntrack_core.c	2004-11-30 05:05:32.000000000 -0500
-@@ -1386,7 +1386,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c	2007-12-15 05:20:06.404205198 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c	2007-12-15 05:20:06.772226171 +0100
+@@ -1410,7 +1410,7 @@
  	nf_unregister_sockopt(&so_getorigdst);
  }
  
@@ -9,7 +11,7 @@
  MODULE_PARM(hashsize, "i");
  
  int __init ip_conntrack_init(void)
-@@ -1407,7 +1407,7 @@
+@@ -1431,7 +1431,7 @@
  		if (ip_conntrack_htable_size < 16)
  			ip_conntrack_htable_size = 16;
  	}
diff --git a/target/linux/generic-2.4/patches/605-netfilter_TTL.patch b/target/linux/generic-2.4/patches/605-netfilter_TTL.patch
index 0aa3c80432..d42436041e 100644
--- a/target/linux/generic-2.4/patches/605-netfilter_TTL.patch
+++ b/target/linux/generic-2.4/patches/605-netfilter_TTL.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.4.30.old/Documentation/Configure.help linux-2.4.30.dev/Documentation/Configure.help
---- linux-2.4.30.old/Documentation/Configure.help	2005-04-27 11:35:46.000000000 +0200
-+++ linux-2.4.30.dev/Documentation/Configure.help	2005-04-27 11:43:49.000000000 +0200
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:20:06.024183543 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:20:06.996238934 +0100
 @@ -3209,6 +3209,15 @@
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -17,9 +18,10 @@ diff -urN linux-2.4.30.old/Documentation/Configure.help linux-2.4.30.dev/Documen
  ipchains (2.2-style) support
  CONFIG_IP_NF_COMPAT_IPCHAINS
    This option places ipchains (with masquerading and redirection
-diff -urN linux-2.4.30.old/include/linux/netfilter_ipv4/ipt_TTL.h linux-2.4.30.dev/include/linux/netfilter_ipv4/ipt_TTL.h
---- linux-2.4.30.old/include/linux/netfilter_ipv4/ipt_TTL.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.30.dev/include/linux/netfilter_ipv4/ipt_TTL.h	2005-04-27 11:43:49.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h	2007-12-15 05:20:07.000239163 +0100
 @@ -0,0 +1,21 @@
 +/* TTL modification module for IP tables
 + * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
@@ -42,10 +44,11 @@ diff -urN linux-2.4.30.old/include/linux/netfilter_ipv4/ipt_TTL.h linux-2.4.30.d
 +
 +
 +#endif
-diff -urN linux-2.4.30.old/net/ipv4/netfilter/Config.in linux-2.4.30.dev/net/ipv4/netfilter/Config.in
---- linux-2.4.30.old/net/ipv4/netfilter/Config.in	2005-04-27 11:35:45.000000000 +0200
-+++ linux-2.4.30.dev/net/ipv4/netfilter/Config.in	2005-04-27 11:43:49.000000000 +0200
-@@ -129,6 +129,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:06.400204969 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:07.000239163 +0100
+@@ -125,6 +125,7 @@
      dep_tristate '    MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
    fi
    dep_tristate '  LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES
@@ -53,9 +56,10 @@ diff -urN linux-2.4.30.old/net/ipv4/netfilter/Config.in linux-2.4.30.dev/net/ipv
    dep_tristate '  ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES
    dep_tristate '  TCPMSS target support' CONFIG_IP_NF_TARGET_TCPMSS $CONFIG_IP_NF_IPTABLES
  fi
-diff -urN linux-2.4.30.old/net/ipv4/netfilter/ipt_TTL.c linux-2.4.30.dev/net/ipv4/netfilter/ipt_TTL.c
---- linux-2.4.30.old/net/ipv4/netfilter/ipt_TTL.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.30.dev/net/ipv4/netfilter/ipt_TTL.c	2005-04-27 11:43:49.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c	2007-12-15 05:20:07.000239163 +0100
 @@ -0,0 +1,110 @@
 +/* TTL modification target for IP tables
 + * (C) 2000 by Harald Welte <laforge@gnumonks.org>
@@ -167,10 +171,11 @@ diff -urN linux-2.4.30.old/net/ipv4/netfilter/ipt_TTL.c linux-2.4.30.dev/net/ipv
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.30.old/net/ipv4/netfilter/Makefile linux-2.4.30.dev/net/ipv4/netfilter/Makefile
---- linux-2.4.30.old/net/ipv4/netfilter/Makefile	2005-04-27 11:35:45.000000000 +0200
-+++ linux-2.4.30.dev/net/ipv4/netfilter/Makefile	2005-04-27 11:43:49.000000000 +0200
-@@ -112,6 +112,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:06.408205428 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:07.000239163 +0100
+@@ -109,6 +109,7 @@
  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
  obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
  obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
diff --git a/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch b/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch
index ccd639181e..1e4b944337 100644
--- a/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch
+++ b/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.4.30.orig/Documentation/Configure.help linux-2.4.30/Documentation/Configure.help
---- linux-2.4.30.orig/Documentation/Configure.help	2005-07-01 02:06:36.000000000 +0200
-+++ linux-2.4.30/Documentation/Configure.help	2005-07-01 00:41:09.000000000 +0200
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:20:06.996238934 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:20:07.284255349 +0100
 @@ -3086,6 +3086,17 @@
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -19,10 +20,11 @@ diff -urN linux-2.4.30.orig/Documentation/Configure.help linux-2.4.30/Documentat
  Packet mangling
  CONFIG_IP_NF_MANGLE
    This option adds a `mangle' table to iptables: see the man page for
-diff -urN linux-2.4.30.orig/net/ipv4/netfilter/Config.in linux-2.4.30/net/ipv4/netfilter/Config.in
---- linux-2.4.30.orig/net/ipv4/netfilter/Config.in	2005-07-01 02:06:35.000000000 +0200
-+++ linux-2.4.30/net/ipv4/netfilter/Config.in	2005-07-01 00:41:09.000000000 +0200
-@@ -69,6 +69,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:07.000239163 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:07.284255349 +0100
+@@ -65,6 +65,7 @@
        define_bool CONFIG_IP_NF_NAT_NEEDED y
        dep_tristate '    MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT
        dep_tristate '    REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT
@@ -30,9 +32,10 @@ diff -urN linux-2.4.30.orig/net/ipv4/netfilter/Config.in linux-2.4.30/net/ipv4/n
        if [ "$CONFIG_IP_NF_PPTP" = "m" ]; then
          define_tristate CONFIG_IP_NF_NAT_PPTP m
        else
-diff -urN linux-2.4.30.orig/net/ipv4/netfilter/ipt_NETMAP.c linux-2.4.30/net/ipv4/netfilter/ipt_NETMAP.c
---- linux-2.4.30.orig/net/ipv4/netfilter/ipt_NETMAP.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.30/net/ipv4/netfilter/ipt_NETMAP.c	2005-07-01 00:41:09.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c	2007-12-15 05:20:07.284255349 +0100
 @@ -0,0 +1,112 @@
 +/* NETMAP - static NAT mapping of IP network addresses (1:1).
 +   The mapping can be applied to source (POSTROUTING),
@@ -146,10 +149,11 @@ diff -urN linux-2.4.30.orig/net/ipv4/netfilter/ipt_NETMAP.c linux-2.4.30/net/ipv
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.30.orig/net/ipv4/netfilter/Makefile linux-2.4.30/net/ipv4/netfilter/Makefile
---- linux-2.4.30.orig/net/ipv4/netfilter/Makefile	2005-07-01 02:06:35.000000000 +0200
-+++ linux-2.4.30/net/ipv4/netfilter/Makefile	2005-07-01 00:41:09.000000000 +0200
-@@ -110,6 +110,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:07.000239163 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:07.288255579 +0100
+@@ -107,6 +107,7 @@
  obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o
  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
diff --git a/target/linux/generic-2.4/patches/607-netfilter_connmark.patch b/target/linux/generic-2.4/patches/607-netfilter_connmark.patch
index 154314dc41..7641f5bdc8 100644
--- a/target/linux/generic-2.4/patches/607-netfilter_connmark.patch
+++ b/target/linux/generic-2.4/patches/607-netfilter_connmark.patch
@@ -1,6 +1,7 @@
-diff -urN linux.old/include/linux/netfilter_ipv4/ip_conntrack.h linux.dev/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux.old/include/linux/netfilter_ipv4/ip_conntrack.h	2005-08-20 20:02:06.619827000 +0200
-+++ linux.dev/include/linux/netfilter_ipv4/ip_conntrack.h	2005-08-20 20:19:23.302029232 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:06.392204515 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:07.552270623 +0100
 @@ -226,6 +226,9 @@
  		unsigned int app_data_len;
  	} layer7;
@@ -11,9 +12,10 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ip_conntrack.h linux.dev/includ
  };
  
  /* get master conntrack via master expectation */
-diff -urN linux.old/include/linux/netfilter_ipv4/ipt_CONNMARK.h linux.dev/include/linux/netfilter_ipv4/ipt_CONNMARK.h
---- linux.old/include/linux/netfilter_ipv4/ipt_CONNMARK.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/linux/netfilter_ipv4/ipt_CONNMARK.h	2005-08-20 20:19:41.058329864 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h	2007-12-15 05:20:07.556270849 +0100
 @@ -0,0 +1,25 @@
 +#ifndef _IPT_CONNMARK_H_target
 +#define _IPT_CONNMARK_H_target
@@ -40,9 +42,10 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ipt_CONNMARK.h linux.dev/includ
 +};
 +
 +#endif /*_IPT_CONNMARK_H_target*/
-diff -urN linux.old/include/linux/netfilter_ipv4/ipt_connmark.h linux.dev/include/linux/netfilter_ipv4/ipt_connmark.h
---- linux.old/include/linux/netfilter_ipv4/ipt_connmark.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/linux/netfilter_ipv4/ipt_connmark.h	2005-08-20 20:19:41.058329864 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h	2007-12-15 05:20:07.564271306 +0100
 @@ -0,0 +1,18 @@
 +#ifndef _IPT_CONNMARK_H
 +#define _IPT_CONNMARK_H
@@ -62,9 +65,10 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ipt_connmark.h linux.dev/includ
 +};
 +
 +#endif /*_IPT_CONNMARK_H*/
-diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Config.in
---- linux.old/net/ipv4/netfilter/Config.in	2005-08-20 20:02:09.325416000 +0200
-+++ linux.dev/net/ipv4/netfilter/Config.in	2005-08-20 20:29:11.546602464 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:07.284255349 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:07.568271536 +0100
 @@ -6,7 +6,8 @@
  
  tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK
@@ -95,9 +99,10 @@ diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Co
    dep_tristate '  LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES
    dep_tristate '  TTL target support' CONFIG_IP_NF_TARGET_TTL $CONFIG_IP_NF_IPTABLES
    dep_tristate '  ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES
-diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Makefile
---- linux.old/net/ipv4/netfilter/Makefile	2005-08-20 20:02:09.326416000 +0200
-+++ linux.dev/net/ipv4/netfilter/Makefile	2005-08-20 20:29:54.081136232 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:07.288255579 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:07.568271536 +0100
 @@ -93,6 +93,7 @@
  
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
@@ -107,17 +112,18 @@ diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Mak
  obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
  obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
 @@ -110,6 +111,7 @@
- obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
+ obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
  obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
  obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
 +obj-$(CONFIG_IP_NF_TARGET_CONNMARK) += ipt_CONNMARK.o
  obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
  obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
  obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o
-diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_core.c linux.dev/net/ipv4/netfilter/ip_conntrack_core.c
---- linux.old/net/ipv4/netfilter/ip_conntrack_core.c	2005-08-20 20:02:06.828795000 +0200
-+++ linux.dev/net/ipv4/netfilter/ip_conntrack_core.c	2005-08-20 20:33:23.308328864 +0200
-@@ -755,6 +755,9 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c	2007-12-15 05:20:06.772226171 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c	2007-12-15 05:20:07.568271536 +0100
+@@ -754,6 +754,9 @@
  		__set_bit(IPS_EXPECTED_BIT, &conntrack->status);
  		conntrack->master = expected;
  		expected->sibling = conntrack;
@@ -127,9 +133,10 @@ diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_core.c linux.dev/net/ipv4/ne
  		LIST_DELETE(&ip_conntrack_expect_list, expected);
  		expected->expectant->expecting--;
  		nf_conntrack_get(&master_ct(conntrack)->infos[0]);
-diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c linux.dev/net/ipv4/netfilter/ip_conntrack_standalone.c
---- linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c	2005-08-20 20:02:06.583833000 +0200
-+++ linux.dev/net/ipv4/netfilter/ip_conntrack_standalone.c	2005-08-20 20:32:15.364657872 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c	2007-12-15 05:20:06.036184227 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c	2007-12-15 05:20:07.568271536 +0100
 @@ -107,6 +107,9 @@
  		len += sprintf(buffer + len, "[ASSURED] ");
  	len += sprintf(buffer + len, "use=%u ",
@@ -140,9 +147,10 @@ diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c linux.dev/net/i
  
  	#if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE)
  	if(conntrack->layer7.app_proto)
-diff -urN linux.old/net/ipv4/netfilter/ipt_CONNMARK.c linux.dev/net/ipv4/netfilter/ipt_CONNMARK.c
---- linux.old/net/ipv4/netfilter/ipt_CONNMARK.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/ipt_CONNMARK.c	2005-08-20 20:21:28.666970864 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c	2007-12-15 05:20:07.568271536 +0100
 @@ -0,0 +1,118 @@
 +/* This kernel module is used to modify the connection mark values, or
 + * to optionally restore the skb nfmark from the connection mark
@@ -262,9 +270,10 @@ diff -urN linux.old/net/ipv4/netfilter/ipt_CONNMARK.c linux.dev/net/ipv4/netfilt
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux.old/net/ipv4/netfilter/ipt_connmark.c linux.dev/net/ipv4/netfilter/ipt_connmark.c
---- linux.old/net/ipv4/netfilter/ipt_connmark.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/ipt_connmark.c	2005-08-20 20:21:28.666970864 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c	2007-12-15 05:20:07.572271763 +0100
 @@ -0,0 +1,83 @@
 +/* This kernel module matches connection mark values set by the
 + * CONNMARK target
diff --git a/target/linux/generic-2.4/patches/608-netfilter_ipset.patch b/target/linux/generic-2.4/patches/608-netfilter_ipset.patch
index 8cf5c694d0..915f39f089 100644
--- a/target/linux/generic-2.4/patches/608-netfilter_ipset.patch
+++ b/target/linux/generic-2.4/patches/608-netfilter_ipset.patch
@@ -1,7 +1,8 @@
-diff -Naur linux-old/Documentation/Configure.help linux-new/Documentation/Configure.help
---- linux-old/Documentation/Configure.help	2005-07-23 23:34:46.000000000 +0200
-+++ linux-new/Documentation/Configure.help	2005-08-10 22:13:01.000000000 +0200
-@@ -3209,6 +3209,75 @@
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:20:07.284255349 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:20:07.880289314 +0100
+@@ -3220,6 +3220,75 @@
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
  
@@ -77,9 +78,10 @@ diff -Naur linux-old/Documentation/Configure.help linux-new/Documentation/Config
  TTL target support
  CONFIG_IP_NF_TARGET_TTL
    This option adds a `TTL' target, which enables the user to set
-diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set.h linux-new/include/linux/netfilter_ipv4/ip_set.h
---- linux-old/include/linux/netfilter_ipv4/ip_set.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ip_set.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h	2007-12-15 05:20:07.884289543 +0100
 @@ -0,0 +1,489 @@
 +#ifndef _IP_SET_H
 +#define _IP_SET_H
@@ -570,9 +572,10 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set.h linux-new/include/lin
 +#endif				/* __KERNEL__ */
 +
 +#endif /*_IP_SET_H*/
-diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_iphash.h linux-new/include/linux/netfilter_ipv4/ip_set_iphash.h
---- linux-old/include/linux/netfilter_ipv4/ip_set_iphash.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ip_set_iphash.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h	2007-12-15 05:20:07.884289543 +0100
 @@ -0,0 +1,30 @@
 +#ifndef __IP_SET_IPHASH_H
 +#define __IP_SET_IPHASH_H
@@ -604,9 +607,10 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_iphash.h linux-new/incl
 +};
 +
 +#endif	/* __IP_SET_IPHASH_H */
-diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-new/include/linux/netfilter_ipv4/ip_set_ipmap.h
---- linux-old/include/linux/netfilter_ipv4/ip_set_ipmap.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ip_set_ipmap.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h	2007-12-15 05:20:07.884289543 +0100
 @@ -0,0 +1,56 @@
 +#ifndef __IP_SET_IPMAP_H
 +#define __IP_SET_IPMAP_H
@@ -664,9 +668,10 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-new/inclu
 +}
 +	
 +#endif /* __IP_SET_IPMAP_H */
-diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_iptree.h linux-new/include/linux/netfilter_ipv4/ip_set_iptree.h
---- linux-old/include/linux/netfilter_ipv4/ip_set_iptree.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ip_set_iptree.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h	2007-12-15 05:20:07.884289543 +0100
 @@ -0,0 +1,39 @@
 +#ifndef __IP_SET_IPTREE_H
 +#define __IP_SET_IPTREE_H
@@ -707,9 +712,10 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_iptree.h linux-new/incl
 +};
 +
 +#endif	/* __IP_SET_IPTREE_H */
-diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_jhash.h linux-new/include/linux/netfilter_ipv4/ip_set_jhash.h
---- linux-old/include/linux/netfilter_ipv4/ip_set_jhash.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ip_set_jhash.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h	2007-12-15 05:20:07.884289543 +0100
 @@ -0,0 +1,148 @@
 +#ifndef _LINUX_IPSET_JHASH_H
 +#define _LINUX_IPSET_JHASH_H
@@ -859,9 +865,10 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_jhash.h linux-new/inclu
 +}
 +
 +#endif /* _LINUX_IPSET_JHASH_H */
-diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-new/include/linux/netfilter_ipv4/ip_set_macipmap.h
---- linux-old/include/linux/netfilter_ipv4/ip_set_macipmap.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ip_set_macipmap.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h	2007-12-15 05:20:07.884289543 +0100
 @@ -0,0 +1,38 @@
 +#ifndef __IP_SET_MACIPMAP_H
 +#define __IP_SET_MACIPMAP_H
@@ -901,9 +908,10 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-new/in
 +};
 +
 +#endif	/* __IP_SET_MACIPMAP_H */
-diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_malloc.h linux-new/include/linux/netfilter_ipv4/ip_set_malloc.h
---- linux-old/include/linux/netfilter_ipv4/ip_set_malloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ip_set_malloc.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h	2007-12-15 05:20:07.888289773 +0100
 @@ -0,0 +1,27 @@
 +#ifndef _IP_SET_MALLOC_H
 +#define _IP_SET_MALLOC_H
@@ -932,9 +940,10 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_malloc.h linux-new/incl
 +#endif				/* __KERNEL__ */
 +
 +#endif /*_IP_SET_MALLOC_H*/
-diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_nethash.h linux-new/include/linux/netfilter_ipv4/ip_set_nethash.h
---- linux-old/include/linux/netfilter_ipv4/ip_set_nethash.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ip_set_nethash.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h	2007-12-15 05:20:07.888289773 +0100
 @@ -0,0 +1,55 @@
 +#ifndef __IP_SET_NETHASH_H
 +#define __IP_SET_NETHASH_H
@@ -991,9 +1000,10 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_nethash.h linux-new/inc
 +}
 +
 +#endif	/* __IP_SET_NETHASH_H */
-diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_portmap.h linux-new/include/linux/netfilter_ipv4/ip_set_portmap.h
---- linux-old/include/linux/netfilter_ipv4/ip_set_portmap.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ip_set_portmap.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h	2007-12-15 05:20:07.888289773 +0100
 @@ -0,0 +1,25 @@
 +#ifndef __IP_SET_PORTMAP_H
 +#define __IP_SET_PORTMAP_H
@@ -1020,9 +1030,10 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_portmap.h linux-new/inc
 +};
 +
 +#endif /* __IP_SET_PORTMAP_H */
-diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_prime.h linux-new/include/linux/netfilter_ipv4/ip_set_prime.h
---- linux-old/include/linux/netfilter_ipv4/ip_set_prime.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ip_set_prime.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h	2007-12-15 05:20:07.888289773 +0100
 @@ -0,0 +1,34 @@
 +#ifndef __IP_SET_PRIME_H
 +#define __IP_SET_PRIME_H
@@ -1058,9 +1069,10 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ip_set_prime.h linux-new/inclu
 +}
 +
 +#endif /* __IP_SET_PRIME_H */
-diff -Naur linux-old/include/linux/netfilter_ipv4/ipt_set.h linux-new/include/linux/netfilter_ipv4/ipt_set.h
---- linux-old/include/linux/netfilter_ipv4/ipt_set.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/include/linux/netfilter_ipv4/ipt_set.h	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h	2007-12-15 05:20:07.888289773 +0100
 @@ -0,0 +1,21 @@
 +#ifndef _IPT_SET_H
 +#define _IPT_SET_H
@@ -1083,10 +1095,11 @@ diff -Naur linux-old/include/linux/netfilter_ipv4/ipt_set.h linux-new/include/li
 +};
 +
 +#endif /*_IPT_SET_H*/
-diff -Naur linux-old/net/ipv4/netfilter/Config.in linux-new/net/ipv4/netfilter/Config.in
---- linux-old/net/ipv4/netfilter/Config.in	2005-07-23 23:34:46.000000000 +0200
-+++ linux-new/net/ipv4/netfilter/Config.in	2005-08-10 22:13:01.000000000 +0200
-@@ -21,6 +21,20 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:07.568271536 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:07.892290000 +0100
+@@ -22,6 +22,20 @@
  if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
  # The simple matches.
    dep_tristate '  limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES
@@ -1107,9 +1120,10 @@ diff -Naur linux-old/net/ipv4/netfilter/Config.in linux-new/net/ipv4/netfilter/C
    dep_tristate '  MAC address match support' CONFIG_IP_NF_MATCH_MAC $CONFIG_IP_NF_IPTABLES
    dep_tristate '  Packet type match support' CONFIG_IP_NF_MATCH_PKTTYPE $CONFIG_IP_NF_IPTABLES
    dep_tristate '  netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
-diff -Naur linux-old/net/ipv4/netfilter/ip_set.c linux-new/net/ipv4/netfilter/ip_set.c
---- linux-old/net/ipv4/netfilter/ip_set.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/net/ipv4/netfilter/ip_set.c	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set.c	2007-12-15 05:20:07.892290000 +0100
 @@ -0,0 +1,2002 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
@@ -3113,9 +3127,10 @@ diff -Naur linux-old/net/ipv4/netfilter/ip_set.c linux-new/net/ipv4/netfilter/ip
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naur linux-old/net/ipv4/netfilter/ip_set_iphash.c linux-new/net/ipv4/netfilter/ip_set_iphash.c
---- linux-old/net/ipv4/netfilter/ip_set_iphash.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/net/ipv4/netfilter/ip_set_iphash.c	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c	2007-12-15 05:20:07.896290225 +0100
 @@ -0,0 +1,379 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *
@@ -3496,9 +3511,10 @@ diff -Naur linux-old/net/ipv4/netfilter/ip_set_iphash.c linux-new/net/ipv4/netfi
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naur linux-old/net/ipv4/netfilter/ip_set_ipmap.c linux-new/net/ipv4/netfilter/ip_set_ipmap.c
---- linux-old/net/ipv4/netfilter/ip_set_ipmap.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/net/ipv4/netfilter/ip_set_ipmap.c	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c	2007-12-15 05:20:07.896290225 +0100
 @@ -0,0 +1,314 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
@@ -3814,9 +3830,10 @@ diff -Naur linux-old/net/ipv4/netfilter/ip_set_ipmap.c linux-new/net/ipv4/netfil
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naur linux-old/net/ipv4/netfilter/ip_set_iptree.c linux-new/net/ipv4/netfilter/ip_set_iptree.c
---- linux-old/net/ipv4/netfilter/ip_set_iptree.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/net/ipv4/netfilter/ip_set_iptree.c	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c	2007-12-15 05:20:07.896290225 +0100
 @@ -0,0 +1,511 @@
 +/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *
@@ -4329,9 +4346,10 @@ diff -Naur linux-old/net/ipv4/netfilter/ip_set_iptree.c linux-new/net/ipv4/netfi
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naur linux-old/net/ipv4/netfilter/ip_set_macipmap.c linux-new/net/ipv4/netfilter/ip_set_macipmap.c
---- linux-old/net/ipv4/netfilter/ip_set_macipmap.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/net/ipv4/netfilter/ip_set_macipmap.c	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c	2007-12-15 05:20:07.896290225 +0100
 @@ -0,0 +1,340 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
@@ -4673,9 +4691,10 @@ diff -Naur linux-old/net/ipv4/netfilter/ip_set_macipmap.c linux-new/net/ipv4/net
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naur linux-old/net/ipv4/netfilter/ip_set_nethash.c linux-new/net/ipv4/netfilter/ip_set_nethash.c
---- linux-old/net/ipv4/netfilter/ip_set_nethash.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/net/ipv4/netfilter/ip_set_nethash.c	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c	2007-12-15 05:20:07.900290454 +0100
 @@ -0,0 +1,450 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *
@@ -5127,9 +5146,10 @@ diff -Naur linux-old/net/ipv4/netfilter/ip_set_nethash.c linux-new/net/ipv4/netf
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naur linux-old/net/ipv4/netfilter/ip_set_portmap.c linux-new/net/ipv4/netfilter/ip_set_portmap.c
---- linux-old/net/ipv4/netfilter/ip_set_portmap.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/net/ipv4/netfilter/ip_set_portmap.c	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c	2007-12-15 05:20:07.900290454 +0100
 @@ -0,0 +1,321 @@
 +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *
@@ -5452,9 +5472,10 @@ diff -Naur linux-old/net/ipv4/netfilter/ip_set_portmap.c linux-new/net/ipv4/netf
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naur linux-old/net/ipv4/netfilter/ipt_set.c linux-new/net/ipv4/netfilter/ipt_set.c
---- linux-old/net/ipv4/netfilter/ipt_set.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/net/ipv4/netfilter/ipt_set.c	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c	2007-12-15 05:20:07.900290454 +0100
 @@ -0,0 +1,114 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
@@ -5570,9 +5591,10 @@ diff -Naur linux-old/net/ipv4/netfilter/ipt_set.c linux-new/net/ipv4/netfilter/i
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naur linux-old/net/ipv4/netfilter/ipt_SET.c linux-new/net/ipv4/netfilter/ipt_SET.c
---- linux-old/net/ipv4/netfilter/ipt_SET.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-new/net/ipv4/netfilter/ipt_SET.c	2005-08-10 22:13:00.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c	2007-12-15 05:20:07.900290454 +0100
 @@ -0,0 +1,127 @@
 +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
 + *                         Patrick Schaaf <bof@bof.de>
@@ -5701,9 +5723,10 @@ diff -Naur linux-old/net/ipv4/netfilter/ipt_SET.c linux-new/net/ipv4/netfilter/i
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naur linux-old/net/ipv4/netfilter/Makefile linux-new/net/ipv4/netfilter/Makefile
---- linux-old/net/ipv4/netfilter/Makefile	2005-07-23 23:34:46.000000000 +0200
-+++ linux-new/net/ipv4/netfilter/Makefile	2005-08-10 22:13:01.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:07.568271536 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:07.900290454 +0100
 @@ -75,6 +75,18 @@
  obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
  obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
diff --git a/target/linux/generic-2.4/patches/609-netfilter_string.patch b/target/linux/generic-2.4/patches/609-netfilter_string.patch
index ed5353f7a9..1f13da2a2f 100644
--- a/target/linux/generic-2.4/patches/609-netfilter_string.patch
+++ b/target/linux/generic-2.4/patches/609-netfilter_string.patch
@@ -1,6 +1,7 @@
-diff -urN linux.old/include/linux/netfilter_ipv4/ipt_string.h linux.dev/include/linux/netfilter_ipv4/ipt_string.h
---- linux.old/include/linux/netfilter_ipv4/ipt_string.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/linux/netfilter_ipv4/ipt_string.h	2006-11-13 23:33:31.000000000 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h	2007-12-15 05:20:08.388318268 +0100
 @@ -0,0 +1,18 @@
 +#ifndef _IPT_STRING_H
 +#define _IPT_STRING_H
@@ -20,10 +21,11 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ipt_string.h linux.dev/include/
 +};
 +
 +#endif /*_IPT_STRING_H*/
-diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Config.in
---- linux.old/net/ipv4/netfilter/Config.in	2006-11-13 23:43:38.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/Config.in	2006-11-13 23:33:31.000000000 +0100
-@@ -52,6 +52,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:07.892290000 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:08.396318720 +0100
+@@ -63,6 +63,7 @@
    fi
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
      dep_tristate '  Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES
@@ -31,9 +33,10 @@ diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Co
      dep_tristate '  Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES
      dep_tristate '  Layer 7 match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7 $CONFIG_IP_NF_CONNTRACK
      dep_mbool '  Layer 7 debugging output (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7_DEBUG $CONFIG_IP_NF_MATCH_LAYER7
-diff -urN linux.old/net/ipv4/netfilter/ipt_string.c linux.dev/net/ipv4/netfilter/ipt_string.c
---- linux.old/net/ipv4/netfilter/ipt_string.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/ipt_string.c	2006-11-14 02:26:03.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c	2007-12-15 05:20:08.400318949 +0100
 @@ -0,0 +1,99 @@
 +/* String matching match for iptables
 + * 
@@ -134,20 +137,22 @@ diff -urN linux.old/net/ipv4/netfilter/ipt_string.c linux.dev/net/ipv4/netfilter
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Makefile
---- linux.old/net/ipv4/netfilter/Makefile	2006-11-13 23:43:38.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/Makefile	2006-11-13 23:33:31.000000000 +0100
-@@ -107,6 +107,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:07.900290454 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:08.400318949 +0100
+@@ -108,6 +108,7 @@
  obj-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark.o
  obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
  obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
 +obj-$(CONFIG_IP_NF_MATCH_STRING) += ipt_string.o
  obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
  obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_layer7.o
- obj-$(CONFIG_IP_NF_MATCH_CONNBYTES) += ipt_connbytes.o
-diff -urN linux.old/net/ipv4/netfilter/textsearch/textsearch.c linux.dev/net/ipv4/netfilter/textsearch/textsearch.c
---- linux.old/net/ipv4/netfilter/textsearch/textsearch.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/textsearch/textsearch.c	2006-11-14 02:31:47.000000000 +0100
+ 
+Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c	2007-12-15 05:20:08.400318949 +0100
 @@ -0,0 +1,305 @@
 +/*
 + * lib/textsearch.c	Generic text search interface
@@ -454,9 +459,10 @@ diff -urN linux.old/net/ipv4/netfilter/textsearch/textsearch.c linux.dev/net/ipv
 +	kfree(conf);
 +}
 +
-diff -urN linux.old/net/ipv4/netfilter/textsearch/textsearch.h linux.dev/net/ipv4/netfilter/textsearch/textsearch.h
---- linux.old/net/ipv4/netfilter/textsearch/textsearch.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/textsearch/textsearch.h	2006-11-14 02:11:59.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h	2007-12-15 05:20:08.400318949 +0100
 @@ -0,0 +1,182 @@
 +#ifndef __LINUX_TEXTSEARCH_H
 +#define __LINUX_TEXTSEARCH_H
@@ -640,9 +646,10 @@ diff -urN linux.old/net/ipv4/netfilter/textsearch/textsearch.h linux.dev/net/ipv
 +#endif /* __KERNEL__ */
 +
 +#endif
-diff -urN linux.old/net/ipv4/netfilter/textsearch/ts_bm.c linux.dev/net/ipv4/netfilter/textsearch/ts_bm.c
---- linux.old/net/ipv4/netfilter/textsearch/ts_bm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/textsearch/ts_bm.c	2006-11-14 02:22:20.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c	2007-12-15 05:20:08.400318949 +0100
 @@ -0,0 +1,190 @@
 +/*
 + * lib/ts_bm.c		Boyer-Moore text search implementation
@@ -834,9 +841,10 @@ diff -urN linux.old/net/ipv4/netfilter/textsearch/ts_bm.c linux.dev/net/ipv4/net
 +{
 +	textsearch_unregister(&bm_ops);
 +}
-diff -urN linux.old/net/ipv4/netfilter/textsearch/ts_kmp.c linux.dev/net/ipv4/netfilter/textsearch/ts_kmp.c
---- linux.old/net/ipv4/netfilter/textsearch/ts_kmp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/net/ipv4/netfilter/textsearch/ts_kmp.c	2006-11-14 02:22:04.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c	2007-12-15 05:20:08.404319178 +0100
 @@ -0,0 +1,141 @@
 +/*
 + * lib/ts_kmp.c		Knuth-Morris-Pratt text search implementation
diff --git a/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch b/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch
index 95bc10f2bc..f903bc9ea2 100644
--- a/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch
+++ b/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch
@@ -1,5 +1,7 @@
---- linux/net/ipv4/netfilter/Config.in.org	2005-11-13 15:53:59.457222512 +0100
-+++ linux/net/ipv4/netfilter/Config.in	2005-11-13 15:56:25.241060000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:08.396318720 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:08.692335591 +0100
 @@ -11,6 +11,8 @@
    dep_tristate '  Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK
    dep_tristate '  TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
@@ -9,18 +11,22 @@
    dep_tristate '  GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK
    dep_tristate '   PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE
  fi
---- linux/net/ipv4/netfilter/Makefile.org	2005-11-12 16:48:38.000000000 +0100
-+++ linux/net/ipv4/netfilter/Makefile	2005-11-13 15:56:38.663019552 +0100
-@@ -94,6 +94,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:08.400318949 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:08.696335817 +0100
+@@ -106,6 +106,7 @@
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_state.o
  obj-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark.o
 +obj-$(CONFIG_IP_NF_MATCH_CONNBYTES) += ipt_connbytes.o
  obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
  obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
- obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
---- linux/net/ipv4/netfilter/ip_conntrack_amanda.c.org	2004-02-18 14:36:32.000000000 +0100
-+++ linux/net/ipv4/netfilter/ip_conntrack_amanda.c	2005-11-13 15:40:00.000000000 +0100
+ obj-$(CONFIG_IP_NF_MATCH_STRING) += ipt_string.o
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_amanda.c	2007-12-15 05:19:37.650566622 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c	2007-12-15 05:20:08.700336046 +0100
 @@ -75,7 +75,7 @@
  
  	/* increase the UDP timeout of the master connection as replies from
@@ -30,8 +36,10 @@
  	
  	/* Search for "CONNECT " string */
  	do {
---- linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c.org	2003-11-28 19:26:21.000000000 +0100
-+++ linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2005-11-13 15:45:41.045992536 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2007-12-15 05:19:37.658567077 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2007-12-15 05:20:08.700336046 +0100
 @@ -211,7 +211,7 @@
  			set_bit(IPS_ASSURED_BIT, &conntrack->status);
  
@@ -41,8 +49,10 @@
  	}
  
  	return NF_ACCEPT;
---- linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c.org	2003-11-28 19:26:21.000000000 +0100
-+++ linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2005-11-13 15:47:38.348159896 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2007-12-15 05:19:37.666567533 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2007-12-15 05:20:08.700336046 +0100
 @@ -47,16 +47,16 @@
  /* Returns verdict for packet, and may modify conntracktype */
  static int udp_packet(struct ip_conntrack *conntrack,
@@ -63,8 +73,10 @@
  
  	return NF_ACCEPT;
  }
---- linux/net/ipv4/netfilter/ip_conntrack_standalone.c.org	2005-11-12 16:48:38.000000000 +0100
-+++ linux/net/ipv4/netfilter/ip_conntrack_standalone.c	2005-11-13 15:51:07.608347512 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c	2007-12-15 05:20:07.568271536 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c	2007-12-15 05:20:08.700336046 +0100
 @@ -79,6 +79,18 @@
  	return len;
  }
@@ -109,8 +121,10 @@
  EXPORT_SYMBOL(ip_ct_find_proto);
  EXPORT_SYMBOL(__ip_ct_find_proto);
  EXPORT_SYMBOL(ip_ct_find_helper);
---- linux/net/ipv4/netfilter/ip_conntrack_proto_generic.c.org	2003-11-28 19:26:21.000000000 +0100
-+++ linux/net/ipv4/netfilter/ip_conntrack_proto_generic.c	2005-11-13 15:44:20.734201784 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_generic.c	2007-12-15 05:19:37.682568446 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c	2007-12-15 05:20:08.700336046 +0100
 @@ -41,9 +41,9 @@
  /* Returns verdict for packet, or -1 for invalid. */
  static int established(struct ip_conntrack *conntrack,
@@ -123,8 +137,10 @@
  	return NF_ACCEPT;
  }
  
---- linux/net/ipv4/netfilter/ip_conntrack_proto_icmp.c.org	2003-11-28 19:26:21.000000000 +0100
-+++ linux/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	2005-11-13 15:44:50.733641176 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	2007-12-15 05:19:37.686568672 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	2007-12-15 05:20:08.704336275 +0100
 @@ -82,7 +82,7 @@
  			ct->timeout.function((unsigned long)ct);
  	} else {
@@ -134,8 +150,10 @@
  	}
  
  	return NF_ACCEPT;
---- linux/net/ipv4/netfilter/ip_conntrack_core.c.org	2005-11-12 16:48:38.000000000 +0100
-+++ linux/net/ipv4/netfilter/ip_conntrack_core.c	2005-11-13 15:43:23.882844504 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c	2007-12-15 05:20:07.568271536 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c	2007-12-15 05:20:08.704336275 +0100
 @@ -1196,22 +1196,40 @@
  
  	MOD_DEC_USE_COUNT;
@@ -180,8 +198,10 @@
  	}
  	WRITE_UNLOCK(&ip_conntrack_lock);
  }
---- linux/include/linux/netfilter_ipv4/ip_conntrack.h.org	2005-11-12 16:48:38.000000000 +0100
-+++ linux/include/linux/netfilter_ipv4/ip_conntrack.h	2005-11-13 15:39:04.000000000 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:07.552270623 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:08.704336275 +0100
 @@ -164,6 +164,12 @@
  	union ip_conntrack_expect_help help;
  };
@@ -221,8 +241,10 @@
  
  /* These are for NAT.  Icky. */
  /* Call me when a conntrack is destroyed. */
---- linux/net/ipv4/netfilter/ipt_connbytes.c.org	1970-01-01 01:00:00.000000000 +0100
-+++ linux/net/ipv4/netfilter/ipt_connbytes.c	2005-11-13 16:22:02.021433872 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c	2007-12-15 05:20:08.704336275 +0100
 @@ -0,0 +1,163 @@
 +/* Kernel module to match connection tracking byte counter.
 + * GPL (C) 2002 Martin Devera (devik@cdi.cz).
@@ -387,8 +409,10 @@
 +module_init(init);
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
---- linux/include/linux/netfilter_ipv4/ipt_connbytes.h.org	1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/linux/netfilter_ipv4/ipt_connbytes.h	2005-11-13 16:11:24.567341624 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h	2007-12-15 05:20:08.708336505 +0100
 @@ -0,0 +1,25 @@
 +#ifndef _IPT_CONNBYTES_H
 +#define _IPT_CONNBYTES_H
@@ -415,8 +439,10 @@
 +};
 +
 +#endif
---- linux-2.4.32/net/ipv4/netfilter/ip_conntrack_proto_gre.c	2006-02-04 19:16:25.000000000 +0100
-+++ /home/florian//openwrt/trunk/openwrt/build_mipsel/linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c	2006-02-04 18:19:08.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_gre.c	2007-12-15 05:20:06.404205198 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c	2007-12-15 05:20:08.708336505 +0100
 @@ -237,16 +237,16 @@
  /* Returns verdict for packet, and may modify conntrack */
  static int gre_packet(struct ip_conntrack *ct,
diff --git a/target/linux/generic-2.4/patches/611-netfilter_condition.patch b/target/linux/generic-2.4/patches/611-netfilter_condition.patch
index 6c16c29f0c..0b5363a442 100644
--- a/target/linux/generic-2.4/patches/611-netfilter_condition.patch
+++ b/target/linux/generic-2.4/patches/611-netfilter_condition.patch
@@ -1,6 +1,7 @@
-diff -ruN linux-2.4.30-old/Documentation/Configure.help linux-2.4.30-new/Documentation/Configure.help
---- linux-2.4.30-old/Documentation/Configure.help	2005-11-13 21:52:27.000000000 +0100
-+++ linux-2.4.30-new/Documentation/Configure.help	2005-11-13 22:20:15.000000000 +0100
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:20:07.880289314 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:20:09.280369103 +0100
 @@ -2979,6 +2979,14 @@
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -31,9 +32,10 @@ diff -ruN linux-2.4.30-old/Documentation/Configure.help linux-2.4.30-new/Documen
  Multiple port match support
  CONFIG_IP6_NF_MATCH_MULTIPORT
    Multiport matching allows you to match TCP or UDP packets based on
-diff -ruN linux-2.4.30-old/include/linux/netfilter_ipv4/ipt_condition.h linux-2.4.30-new/include/linux/netfilter_ipv4/ipt_condition.h
---- linux-2.4.30-old/include/linux/netfilter_ipv4/ipt_condition.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.30-new/include/linux/netfilter_ipv4/ipt_condition.h	2005-11-13 22:20:14.000000000 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h	2007-12-15 05:20:09.296370013 +0100
 @@ -0,0 +1,11 @@
 +#ifndef __IPT_CONDITION_MATCH__
 +#define __IPT_CONDITION_MATCH__
@@ -46,9 +48,10 @@ diff -ruN linux-2.4.30-old/include/linux/netfilter_ipv4/ipt_condition.h linux-2.
 +};
 +
 +#endif
-diff -ruN linux-2.4.30-old/include/linux/netfilter_ipv6/ip6t_condition.h linux-2.4.30-new/include/linux/netfilter_ipv6/ip6t_condition.h
---- linux-2.4.30-old/include/linux/netfilter_ipv6/ip6t_condition.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.30-new/include/linux/netfilter_ipv6/ip6t_condition.h	2005-11-13 22:20:14.000000000 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h	2007-12-15 05:20:09.300370243 +0100
 @@ -0,0 +1,11 @@
 +#ifndef __IP6T_CONDITION_MATCH__
 +#define __IP6T_CONDITION_MATCH__
@@ -61,9 +64,10 @@ diff -ruN linux-2.4.30-old/include/linux/netfilter_ipv6/ip6t_condition.h linux-2
 +};
 +
 +#endif
-diff -ruN linux-2.4.30-old/net/ipv4/netfilter/Config.in linux-2.4.30-new/net/ipv4/netfilter/Config.in
---- linux-2.4.30-old/net/ipv4/netfilter/Config.in	2005-11-13 21:52:27.000000000 +0100
-+++ linux-2.4.30-new/net/ipv4/netfilter/Config.in	2005-11-13 22:20:15.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:08.692335591 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:09.300370243 +0100
 @@ -43,6 +43,7 @@
    dep_tristate '  netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
    dep_tristate '  Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES
@@ -72,9 +76,10 @@ diff -ruN linux-2.4.30-old/net/ipv4/netfilter/Config.in linux-2.4.30-new/net/ipv
    dep_tristate '  recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
    dep_tristate '  ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES
    dep_tristate '  peer to peer traffic match support' CONFIG_IP_NF_MATCH_IPP2P $CONFIG_IP_NF_IPTABLES
-diff -ruN linux-2.4.30-old/net/ipv4/netfilter/Makefile linux-2.4.30-new/net/ipv4/netfilter/Makefile
---- linux-2.4.30-old/net/ipv4/netfilter/Makefile	2005-11-13 21:52:27.000000000 +0100
-+++ linux-2.4.30-new/net/ipv4/netfilter/Makefile	2005-11-13 22:20:15.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:08.696335817 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:09.300370243 +0100
 @@ -94,6 +94,7 @@
  obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
  obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o
@@ -83,9 +88,10 @@ diff -ruN linux-2.4.30-old/net/ipv4/netfilter/Makefile linux-2.4.30-new/net/ipv4
  
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  
-diff -ruN linux-2.4.30-old/net/ipv4/netfilter/ipt_condition.c linux-2.4.30-new/net/ipv4/netfilter/ipt_condition.c
---- linux-2.4.30-old/net/ipv4/netfilter/ipt_condition.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.30-new/net/ipv4/netfilter/ipt_condition.c	2005-11-13 22:20:14.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c	2007-12-15 05:20:09.300370243 +0100
 @@ -0,0 +1,256 @@
 +/*-------------------------------------------*\
 +|          Netfilter Condition Module         |
@@ -343,9 +349,10 @@ diff -ruN linux-2.4.30-old/net/ipv4/netfilter/ipt_condition.c linux-2.4.30-new/n
 +
 +module_init(init);
 +module_exit(fini);
-diff -ruN linux-2.4.30-old/net/ipv6/netfilter/Config.in linux-2.4.30-new/net/ipv6/netfilter/Config.in
---- linux-2.4.30-old/net/ipv6/netfilter/Config.in	2003-06-13 16:51:39.000000000 +0200
-+++ linux-2.4.30-new/net/ipv6/netfilter/Config.in	2005-11-13 22:20:15.000000000 +0100
+Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in	2007-12-15 05:19:37.590563202 +0100
++++ linux-2.4.35.4/net/ipv6/netfilter/Config.in	2007-12-15 05:20:09.300370243 +0100
 @@ -17,6 +17,7 @@
  if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; then
  # The simple matches.
@@ -354,9 +361,10 @@ diff -ruN linux-2.4.30-old/net/ipv6/netfilter/Config.in linux-2.4.30-new/net/ipv
    dep_tristate '  MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
      dep_tristate '  Routing header match support (EXPERIMENTAL)' CONFIG_IP6_NF_MATCH_RT $CONFIG_IP6_NF_IPTABLES
-diff -ruN linux-2.4.30-old/net/ipv6/netfilter/Makefile linux-2.4.30-new/net/ipv6/netfilter/Makefile
---- linux-2.4.30-old/net/ipv6/netfilter/Makefile	2003-06-13 16:51:39.000000000 +0200
-+++ linux-2.4.30-new/net/ipv6/netfilter/Makefile	2005-11-13 22:20:15.000000000 +0100
+Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile	2007-12-15 05:19:37.598563658 +0100
++++ linux-2.4.35.4/net/ipv6/netfilter/Makefile	2007-12-15 05:20:09.304370470 +0100
 @@ -14,6 +14,7 @@
  # Link order matters here.
  obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
@@ -365,9 +373,10 @@ diff -ruN linux-2.4.30-old/net/ipv6/netfilter/Makefile linux-2.4.30-new/net/ipv6
  obj-$(CONFIG_IP6_NF_MATCH_MARK) += ip6t_mark.o
  obj-$(CONFIG_IP6_NF_MATCH_LENGTH) += ip6t_length.o
  obj-$(CONFIG_IP6_NF_MATCH_MAC) += ip6t_mac.o
-diff -ruN linux-2.4.30-old/net/ipv6/netfilter/ip6t_condition.c linux-2.4.30-new/net/ipv6/netfilter/ip6t_condition.c
---- linux-2.4.30-old/net/ipv6/netfilter/ip6t_condition.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.30-new/net/ipv6/netfilter/ip6t_condition.c	2005-11-13 22:20:14.000000000 +0100
+Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c	2007-12-15 05:20:09.304370470 +0100
 @@ -0,0 +1,254 @@
 +/*-------------------------------------------*\
 +|    Netfilter Condition Module for IPv6      |
diff --git a/target/linux/generic-2.4/patches/612-netfilter_quota.patch b/target/linux/generic-2.4/patches/612-netfilter_quota.patch
index a0a019c171..65c32c5929 100644
--- a/target/linux/generic-2.4/patches/612-netfilter_quota.patch
+++ b/target/linux/generic-2.4/patches/612-netfilter_quota.patch
@@ -1,6 +1,7 @@
-diff -ruN linux-2.4.30-old/Documentation/Configure.help linux-2.4.30-new/Documentation/Configure.help
---- linux-2.4.30-old/Documentation/Configure.help	2005-11-13 22:30:42.000000000 +0100
-+++ linux-2.4.30-new/Documentation/Configure.help	2005-11-13 22:31:17.000000000 +0100
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:20:09.280369103 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:20:09.632389161 +0100
 @@ -2888,6 +2888,13 @@
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -15,9 +16,10 @@ diff -ruN linux-2.4.30-old/Documentation/Configure.help linux-2.4.30-new/Documen
  skb->pkt_type packet match support
  CONFIG_IP_NF_MATCH_PKTTYPE
    This patch allows you to match packet in accrodance
-diff -ruN linux-2.4.30-old/include/linux/netfilter_ipv4/ipt_quota.h linux-2.4.30-new/include/linux/netfilter_ipv4/ipt_quota.h
---- linux-2.4.30-old/include/linux/netfilter_ipv4/ipt_quota.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.30-new/include/linux/netfilter_ipv4/ipt_quota.h	2005-11-13 22:31:17.000000000 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h	2007-12-15 05:20:09.636389390 +0100
 @@ -0,0 +1,12 @@
 +#ifndef _IPT_QUOTA_H
 +#define _IPT_QUOTA_H
@@ -31,9 +33,10 @@ diff -ruN linux-2.4.30-old/include/linux/netfilter_ipv4/ipt_quota.h linux-2.4.30
 +};
 +
 +#endif /*_IPT_QUOTA_H*/
-diff -ruN linux-2.4.30-old/net/ipv4/netfilter/Config.in linux-2.4.30-new/net/ipv4/netfilter/Config.in
---- linux-2.4.30-old/net/ipv4/netfilter/Config.in	2005-11-13 22:30:42.000000000 +0100
-+++ linux-2.4.30-new/net/ipv4/netfilter/Config.in	2005-11-13 22:31:17.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:09.300370243 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:09.644389846 +0100
 @@ -24,6 +24,7 @@
  if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
  # The simple matches.
@@ -42,9 +45,10 @@ diff -ruN linux-2.4.30-old/net/ipv4/netfilter/Config.in linux-2.4.30-new/net/ipv
  
    dep_tristate '  IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES
    if [ "$CONFIG_IP_NF_SET" != "n" ]; then
-diff -ruN linux-2.4.30-old/net/ipv4/netfilter/Makefile linux-2.4.30-new/net/ipv4/netfilter/Makefile
---- linux-2.4.30-old/net/ipv4/netfilter/Makefile	2005-11-13 22:30:42.000000000 +0100
-+++ linux-2.4.30-new/net/ipv4/netfilter/Makefile	2005-11-13 22:31:17.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:09.300370243 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:09.644389846 +0100
 @@ -74,6 +74,7 @@
  # matches
  obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
@@ -53,9 +57,10 @@ diff -ruN linux-2.4.30-old/net/ipv4/netfilter/Makefile linux-2.4.30-new/net/ipv4
  obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
  obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o
-diff -ruN linux-2.4.30-old/net/ipv4/netfilter/ipt_quota.c linux-2.4.30-new/net/ipv4/netfilter/ipt_quota.c
---- linux-2.4.30-old/net/ipv4/netfilter/ipt_quota.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.30-new/net/ipv4/netfilter/ipt_quota.c	2005-11-13 22:31:17.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c	2007-12-15 05:20:09.644389846 +0100
 @@ -0,0 +1,88 @@
 +/* 
 + * netfilter module to enforce network quotas
diff --git a/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch b/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch
index 983d4fef3a..553d1151d0 100644
--- a/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch
+++ b/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/netfilter/Config.in
---- linux-2.4.32/net/ipv4/netfilter/Config.in	2006-03-01 00:49:36.652505800 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/Config.in	2006-03-01 00:50:18.692114808 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:09.644389846 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:09.916405347 +0100
 @@ -15,6 +15,7 @@
    dep_tristate '  Connection byte counter support' CONFIG_IP_NF_MATCH_CONNBYTES $CONFIG_IP_NF_CT_ACCT $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES
    dep_tristate '  GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK
@@ -9,7 +10,7 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/ne
  fi
  
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-@@ -111,6 +112,13 @@
+@@ -110,6 +111,13 @@
            define_tristate CONFIG_IP_NF_NAT_AMANDA $CONFIG_IP_NF_NAT
          fi
        fi
@@ -23,9 +24,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/ne
        if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
          dep_tristate '    Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT
        fi
-diff -urN linux-2.4.32/net/ipv4/netfilter/Makefile linux-2.4.32.new/net/ipv4/netfilter/Makefile
---- linux-2.4.32/net/ipv4/netfilter/Makefile	2006-03-01 00:49:36.654505496 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/Makefile	2006-03-01 00:50:18.693114656 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:09.644389846 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:09.916405347 +0100
 @@ -53,6 +53,10 @@
  ifdef CONFIG_IP_NF_NAT_PPTP
  	export-objs += ip_conntrack_pptp.o
@@ -45,9 +47,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Makefile linux-2.4.32.new/net/ipv4/net
  
  # generic IP tables 
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-diff -urN linux-2.4.32/net/ipv4/netfilter/ip_conntrack_h323.c linux-2.4.32.new/net/ipv4/netfilter/ip_conntrack_h323.c
---- linux-2.4.32/net/ipv4/netfilter/ip_conntrack_h323.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/ip_conntrack_h323.c	2006-03-01 00:50:18.694114504 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c	2007-12-15 05:20:09.920405577 +0100
 @@ -0,0 +1,302 @@
 +/* 
 + * H.323 'brute force' extension for H.323 connection tracking. 
@@ -351,9 +354,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/ip_conntrack_h323.c linux-2.4.32.new/n
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.32/net/ipv4/netfilter/ip_nat_h323.c linux-2.4.32.new/net/ipv4/netfilter/ip_nat_h323.c
---- linux-2.4.32/net/ipv4/netfilter/ip_nat_h323.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/ip_nat_h323.c	2006-03-01 00:50:18.698113896 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c	2007-12-15 05:20:09.920405577 +0100
 @@ -0,0 +1,403 @@
 +/* 
 + * H.323 'brute force' extension for NAT alteration. 
@@ -758,9 +762,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/ip_nat_h323.c linux-2.4.32.new/net/ipv
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack.h	2006-03-01 00:49:36.474532856 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack.h	2006-03-01 00:50:18.699113744 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:08.704336275 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:09.920405577 +0100
 @@ -71,6 +71,7 @@
  #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
  #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
@@ -785,9 +790,10 @@ diff -urN linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.32.
  };
  
  #ifdef CONFIG_IP_NF_NAT_NEEDED
-diff -urN linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack_h323.h linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack_h323.h
---- linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack_h323.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack_h323.h	2006-03-01 00:50:18.700113592 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h	2007-12-15 05:20:09.920405577 +0100
 @@ -0,0 +1,30 @@
 +#ifndef _IP_CONNTRACK_H323_H
 +#define _IP_CONNTRACK_H323_H
diff --git a/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch b/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch
index 6ae3e7b0aa..6c0184a55c 100644
--- a/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch
+++ b/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/netfilter/Config.in
---- linux-2.4.32/net/ipv4/netfilter/Config.in	2006-03-01 00:53:57.884792456 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/Config.in	2006-03-01 00:55:14.462150928 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:09.916405347 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:10.196421304 +0100
 @@ -16,6 +16,7 @@
    dep_tristate '  GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK
    dep_tristate '   PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE
@@ -9,7 +10,7 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/ne
  fi
  
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-@@ -119,6 +120,13 @@
+@@ -118,6 +119,13 @@
           define_tristate CONFIG_IP_NF_NAT_H323 $CONFIG_IP_NF_NAT
         fi
        fi
@@ -23,9 +24,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/ne
        if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
          dep_tristate '    Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT
        fi
-diff -urN linux-2.4.32/net/ipv4/netfilter/Makefile linux-2.4.32.new/net/ipv4/netfilter/Makefile
---- linux-2.4.32/net/ipv4/netfilter/Makefile	2006-03-01 00:53:57.886792152 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/Makefile	2006-03-01 00:55:14.463150776 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:09.916405347 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:10.196421304 +0100
 @@ -57,6 +57,11 @@
  ifdef CONFIG_IP_NF_NAT_H323
         export-objs += ip_conntrack_h323.o
@@ -46,9 +48,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Makefile linux-2.4.32.new/net/ipv4/net
  
  # generic IP tables 
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-diff -urN linux-2.4.32/net/ipv4/netfilter/ip_conntrack_rtsp.c linux-2.4.32.new/net/ipv4/netfilter/ip_conntrack_rtsp.c
---- linux-2.4.32/net/ipv4/netfilter/ip_conntrack_rtsp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/ip_conntrack_rtsp.c	2006-03-01 00:55:14.465150472 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c	2007-12-15 05:20:10.200421534 +0100
 @@ -0,0 +1,507 @@
 +/*
 + * RTSP extension for IP connection tracking
@@ -557,9 +560,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/ip_conntrack_rtsp.c linux-2.4.32.new/n
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.32/net/ipv4/netfilter/ip_nat_rtsp.c linux-2.4.32.new/net/ipv4/netfilter/ip_nat_rtsp.c
---- linux-2.4.32/net/ipv4/netfilter/ip_nat_rtsp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/ip_nat_rtsp.c	2006-03-01 00:55:14.467150168 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c	2007-12-15 05:20:10.200421534 +0100
 @@ -0,0 +1,621 @@
 +/*
 + * RTSP extension for TCP NAT alteration
@@ -1182,8 +1186,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/ip_nat_rtsp.c linux-2.4.32.new/net/ipv
 +
 +module_init(init);
 +module_exit(fini);
---- linux-2.4.32/arch/mips/kernel/mips_ksyms.c	2006-03-01 00:49:34.142887320 +0100
-+++ linux-2.4.32.new/arch/mips/kernel/mips_ksyms.c	2006-03-01 00:55:14.469149864 +0100
+Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
+===================================================================
+--- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c	2007-12-15 05:19:54.695537960 +0100
++++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c	2007-12-15 05:20:10.200421534 +0100
 @@ -52,6 +52,7 @@
  /*
   * String functions
@@ -1192,9 +1198,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/ip_nat_rtsp.c linux-2.4.32.new/net/ipv
  EXPORT_SYMBOL_NOVERS(memcmp);
  EXPORT_SYMBOL_NOVERS(memset);
  EXPORT_SYMBOL_NOVERS(memcpy);
-diff -urN linux-2.4.32/include/linux/netfilter_helpers.h linux-2.4.32.new/include/linux/netfilter_helpers.h
---- linux-2.4.32/include/linux/netfilter_helpers.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_helpers.h	2006-03-01 00:55:14.470149712 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_helpers.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_helpers.h	2007-12-15 05:20:10.200421534 +0100
 @@ -0,0 +1,133 @@
 +/*
 + * Helpers for netfiler modules.  This file provides implementations for basic
@@ -1329,9 +1336,10 @@ diff -urN linux-2.4.32/include/linux/netfilter_helpers.h linux-2.4.32.new/includ
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_HELPERS_H */
-diff -urN linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
---- linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h	2006-03-01 00:55:14.472149408 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h	2007-12-15 05:20:10.200421534 +0100
 @@ -0,0 +1,68 @@
 +/*
 + * RTSP extension for IP connection tracking.
@@ -1401,9 +1409,10 @@ diff -urN linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h linux-2.
 +#endif /* __KERNEL__ */
 +
 +#endif /* _IP_CONNTRACK_RTSP_H */
-diff -urN linux-2.4.32/include/linux/netfilter_mime.h linux-2.4.32.new/include/linux/netfilter_mime.h
---- linux-2.4.32/include/linux/netfilter_mime.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_mime.h	2006-03-01 00:55:14.473149256 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_mime.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_mime.h	2007-12-15 05:20:10.204421761 +0100
 @@ -0,0 +1,90 @@
 +/*
 + * MIME functions for netfilter modules.  This file provides implementations
@@ -1495,8 +1504,10 @@ diff -urN linux-2.4.32/include/linux/netfilter_mime.h linux-2.4.32.new/include/l
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_MIME_H */
---- linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack.h	2006-03-01 00:53:57.889791696 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack.h	2006-03-01 01:06:32.178122440 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:09.920405577 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:10.204421761 +0100
 @@ -72,6 +72,7 @@
  #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
  #include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
diff --git a/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch b/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch
index 3871d59395..e68e2a974a 100644
--- a/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch
+++ b/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch
@@ -1,6 +1,7 @@
-diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/netfilter/Config.in
---- linux-2.4.32/net/ipv4/netfilter/Config.in	2006-03-01 01:12:48.268947944 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/Config.in	2006-03-01 01:14:53.455916632 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:10.196421304 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:10.504438857 +0100
 @@ -17,6 +17,7 @@
    dep_tristate '   PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE
    dep_tristate '  H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK
@@ -9,7 +10,7 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/ne
  fi
  
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-@@ -127,6 +128,13 @@
+@@ -126,6 +127,13 @@
           define_tristate CONFIG_IP_NF_NAT_RTSP $CONFIG_IP_NF_NAT
         fi
        fi
@@ -23,9 +24,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Config.in linux-2.4.32.new/net/ipv4/ne
        if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
          dep_tristate '    Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT
        fi
-diff -urN linux-2.4.32/net/ipv4/netfilter/Makefile linux-2.4.32.new/net/ipv4/netfilter/Makefile
---- linux-2.4.32/net/ipv4/netfilter/Makefile	2006-03-01 01:12:48.270947640 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/Makefile	2006-03-01 01:15:25.263081208 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:10.196421304 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:10.508439083 +0100
 @@ -61,6 +61,10 @@
  ifdef CONFIG_IP_NF_NAT_RTSP
         export-objs += ip_conntrack_rtsp.o
@@ -45,9 +47,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/Makefile linux-2.4.32.new/net/ipv4/net
  
  # generic IP tables 
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-diff -urN linux-2.4.32/net/ipv4/netfilter/ip_conntrack_mms.c linux-2.4.32.new/net/ipv4/netfilter/ip_conntrack_mms.c
---- linux-2.4.32/net/ipv4/netfilter/ip_conntrack_mms.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/ip_conntrack_mms.c	2006-03-01 01:13:32.991149136 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c	2007-12-15 05:20:10.516439541 +0100
 @@ -0,0 +1,292 @@
 +/* MMS extension for IP connection tracking
 + * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be>
@@ -341,9 +344,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/ip_conntrack_mms.c linux-2.4.32.new/ne
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.32/net/ipv4/netfilter/ip_nat_mms.c linux-2.4.32.new/net/ipv4/netfilter/ip_nat_mms.c
---- linux-2.4.32/net/ipv4/netfilter/ip_nat_mms.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/net/ipv4/netfilter/ip_nat_mms.c	2006-03-01 01:13:32.992148984 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c	2007-12-15 05:20:10.516439541 +0100
 @@ -0,0 +1,330 @@
 +/* MMS extension for TCP NAT alteration.
 + * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be>
@@ -675,9 +679,10 @@ diff -urN linux-2.4.32/net/ipv4/netfilter/ip_nat_mms.c linux-2.4.32.new/net/ipv4
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack.h	2006-03-01 01:12:47.910002512 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack.h	2006-03-01 01:16:16.710260048 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:10.204421761 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h	2007-12-15 05:20:10.516439541 +0100
 @@ -73,6 +73,7 @@
  #include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
  #include <linux/netfilter_ipv4/ip_conntrack_h323.h>
@@ -702,9 +707,10 @@ diff -urN linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.32.
  };
  
  #ifdef CONFIG_IP_NF_NAT_NEEDED
-diff -urN linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack_mms.h linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack_mms.h
---- linux-2.4.32/include/linux/netfilter_ipv4/ip_conntrack_mms.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32.new/include/linux/netfilter_ipv4/ip_conntrack_mms.h	2006-03-01 01:13:32.993148832 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h	2007-12-15 05:20:10.516439541 +0100
 @@ -0,0 +1,31 @@
 +#ifndef _IP_CONNTRACK_MMS_H
 +#define _IP_CONNTRACK_MMS_H
diff --git a/target/linux/generic-2.4/patches/616-netfilter_imq.patch b/target/linux/generic-2.4/patches/616-netfilter_imq.patch
index e2e45af882..4df115017c 100644
--- a/target/linux/generic-2.4/patches/616-netfilter_imq.patch
+++ b/target/linux/generic-2.4/patches/616-netfilter_imq.patch
@@ -1,7 +1,8 @@
-diff -aurN linux-2.4.28-orig/Documentation/Configure.help linux-2.4.28/Documentation/Configure.help
---- linux-2.4.28-orig/Documentation/Configure.help	2004-11-17 11:54:20.000000000 +0000
-+++ linux-2.4.28/Documentation/Configure.help	2004-12-14 11:43:42.000000000 +0000
-@@ -3147,6 +3147,22 @@
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:20:09.632389161 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:20:10.792455269 +0100
+@@ -3160,6 +3160,22 @@
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
  
@@ -24,7 +25,7 @@ diff -aurN linux-2.4.28-orig/Documentation/Configure.help linux-2.4.28/Documenta
  MARK target support
  CONFIG_IP_NF_TARGET_MARK
    This option adds a `MARK' target, which allows you to create rules
-@@ -9799,6 +9815,20 @@
+@@ -9919,6 +9935,20 @@
    say M here and read <file:Documentation/modules.txt>.  The module
    will be called bonding.o.
  
@@ -45,9 +46,10 @@ diff -aurN linux-2.4.28-orig/Documentation/Configure.help linux-2.4.28/Documenta
  SLIP (serial line) support
  CONFIG_SLIP
    Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
-diff -aurN linux-2.4.28-orig/drivers/net/Config.in linux-2.4.28/drivers/net/Config.in
---- linux-2.4.28-orig/drivers/net/Config.in	2004-08-07 23:26:04.000000000 +0000
-+++ linux-2.4.28/drivers/net/Config.in	2004-12-14 11:43:42.000000000 +0000
+Index: linux-2.4.35.4/drivers/net/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/Config.in	2007-12-15 05:19:54.067502171 +0100
++++ linux-2.4.35.4/drivers/net/Config.in	2007-12-15 05:20:10.796455498 +0100
 @@ -7,6 +7,11 @@
  tristate 'Dummy net driver support' CONFIG_DUMMY
  tristate 'Bonding driver support' CONFIG_BONDING
@@ -58,12 +60,13 @@ diff -aurN linux-2.4.28-orig/drivers/net/Config.in linux-2.4.28/drivers/net/Conf
 +  comment 'IMQ needs CONFIG_NETFILTER enabled'
 +fi
  tristate 'Universal TUN/TAP device driver support' CONFIG_TUN
+ bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM
  if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-    tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP
-diff -aurN linux-2.4.28-orig/drivers/net/Makefile linux-2.4.28/drivers/net/Makefile
---- linux-2.4.28-orig/drivers/net/Makefile	2004-08-07 23:26:04.000000000 +0000
-+++ linux-2.4.28/drivers/net/Makefile	2004-12-14 11:43:42.000000000 +0000
-@@ -170,6 +170,7 @@
+Index: linux-2.4.35.4/drivers/net/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/drivers/net/Makefile	2007-12-15 05:19:51.931380439 +0100
++++ linux-2.4.35.4/drivers/net/Makefile	2007-12-15 05:20:10.804455954 +0100
+@@ -176,6 +176,7 @@
  
  obj-$(CONFIG_STRIP) += strip.o
  obj-$(CONFIG_DUMMY) += dummy.o
@@ -71,9 +74,10 @@ diff -aurN linux-2.4.28-orig/drivers/net/Makefile linux-2.4.28/drivers/net/Makef
  obj-$(CONFIG_DE600) += de600.o
  obj-$(CONFIG_DE620) += de620.o
  obj-$(CONFIG_AT1500) += lance.o
-diff -aurN linux-2.4.28-orig/drivers/net/imq.c linux-2.4.28/drivers/net/imq.c
---- linux-2.4.28-orig/drivers/net/imq.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.4.28/drivers/net/imq.c	2004-12-14 11:43:42.000000000 +0000
+Index: linux-2.4.35.4/drivers/net/imq.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/drivers/net/imq.c	2007-12-15 05:20:10.808456180 +0100
 @@ -0,0 +1,321 @@
 +/*
 + *             Pseudo-driver for the intermediate queue device.
@@ -396,9 +400,10 @@ diff -aurN linux-2.4.28-orig/drivers/net/imq.c linux-2.4.28/drivers/net/imq.c
 +module_init(imq_init_module);
 +module_exit(imq_cleanup_module);
 +MODULE_LICENSE("GPL");
-diff -aurN linux-2.4.28-orig/include/linux/imq.h linux-2.4.28/include/linux/imq.h
---- linux-2.4.28-orig/include/linux/imq.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.4.28/include/linux/imq.h	2004-12-14 11:43:42.000000000 +0000
+Index: linux-2.4.35.4/include/linux/imq.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/imq.h	2007-12-15 05:20:10.808456180 +0100
 @@ -0,0 +1,9 @@
 +#ifndef _IMQ_H
 +#define _IMQ_H
@@ -409,9 +414,10 @@ diff -aurN linux-2.4.28-orig/include/linux/imq.h linux-2.4.28/include/linux/imq.
 +#define IMQ_F_ENQUEUE	0x80
 +
 +#endif /* _IMQ_H */
-diff -aurN linux-2.4.28-orig/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.4.28/include/linux/netfilter_ipv4/ipt_IMQ.h
---- linux-2.4.28-orig/include/linux/netfilter_ipv4/ipt_IMQ.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.4.28/include/linux/netfilter_ipv4/ipt_IMQ.h	2004-12-14 11:43:42.000000000 +0000
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h	2007-12-15 05:20:10.808456180 +0100
 @@ -0,0 +1,8 @@
 +#ifndef _IPT_IMQ_H
 +#define _IPT_IMQ_H
@@ -421,9 +427,10 @@ diff -aurN linux-2.4.28-orig/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.4.28
 +};
 +
 +#endif /* _IPT_IMQ_H */
-diff -aurN linux-2.4.28-orig/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.4.28/include/linux/netfilter_ipv6/ip6t_IMQ.h
---- linux-2.4.28-orig/include/linux/netfilter_ipv6/ip6t_IMQ.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.4.28/include/linux/netfilter_ipv6/ip6t_IMQ.h	2004-12-14 11:43:42.000000000 +0000
+Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h	2007-12-15 05:20:10.808456180 +0100
 @@ -0,0 +1,8 @@
 +#ifndef _IP6T_IMQ_H
 +#define _IP6T_IMQ_H
@@ -433,9 +440,10 @@ diff -aurN linux-2.4.28-orig/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.4.2
 +};
 +
 +#endif /* _IP6T_IMQ_H */
-diff -aurN linux-2.4.28-orig/include/linux/skbuff.h linux-2.4.28/include/linux/skbuff.h
---- linux-2.4.28-orig/include/linux/skbuff.h	2004-08-07 23:26:06.000000000 +0000
-+++ linux-2.4.28/include/linux/skbuff.h	2004-12-14 11:43:42.000000000 +0000
+Index: linux-2.4.35.4/include/linux/skbuff.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/skbuff.h	2007-12-15 05:20:05.060128604 +0100
++++ linux-2.4.35.4/include/linux/skbuff.h	2007-12-15 05:20:10.808456180 +0100
 @@ -93,6 +93,9 @@
  	struct nf_conntrack *master;
  };
@@ -465,9 +473,10 @@ diff -aurN linux-2.4.28-orig/include/linux/skbuff.h linux-2.4.28/include/linux/s
  };
  
  #ifdef __KERNEL__
-diff -aurN linux-2.4.28-orig/net/core/skbuff.c linux-2.4.28/net/core/skbuff.c
---- linux-2.4.28-orig/net/core/skbuff.c	2003-08-25 11:44:44.000000000 +0000
-+++ linux-2.4.28/net/core/skbuff.c	2004-12-14 11:43:42.000000000 +0000
+Index: linux-2.4.35.4/net/core/skbuff.c
+===================================================================
+--- linux-2.4.35.4.orig/net/core/skbuff.c	2007-12-15 05:19:37.174539496 +0100
++++ linux-2.4.35.4/net/core/skbuff.c	2007-12-15 05:20:10.812456409 +0100
 @@ -202,6 +202,10 @@
  	/* Set up other state */
  	skb->len = 0;
@@ -512,31 +521,34 @@ diff -aurN linux-2.4.28-orig/net/core/skbuff.c linux-2.4.28/net/core/skbuff.c
  }
  
  /**
-diff -aurN linux-2.4.28-orig/net/ipv4/netfilter/Config.in linux-2.4.28/net/ipv4/netfilter/Config.in
---- linux-2.4.28-orig/net/ipv4/netfilter/Config.in	2003-08-25 11:44:44.000000000 +0000
-+++ linux-2.4.28/net/ipv4/netfilter/Config.in	2004-12-14 11:43:43.000000000 +0000
-@@ -104,6 +104,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:10.504438857 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:10.812456409 +0100
+@@ -171,6 +171,7 @@
      dep_tristate '    DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE
   
      dep_tristate '    MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
 +    dep_tristate '    IMQ target support' CONFIG_IP_NF_TARGET_IMQ $CONFIG_IP_NF_MANGLE
    fi
-   dep_tristate '  LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES
-   dep_tristate '  ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES
-diff -aurN linux-2.4.28-orig/net/ipv4/netfilter/Makefile linux-2.4.28/net/ipv4/netfilter/Makefile
---- linux-2.4.28-orig/net/ipv4/netfilter/Makefile	2003-08-25 11:44:44.000000000 +0000
-+++ linux-2.4.28/net/ipv4/netfilter/Makefile	2004-12-14 11:43:43.000000000 +0000
-@@ -94,6 +94,7 @@
+   if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then
+     dep_tristate '  CONNMARK target support' CONFIG_IP_NF_TARGET_CONNMARK $CONFIG_IP_NF_IPTABLES
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:10.508439083 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:10.812456409 +0100
+@@ -138,6 +138,7 @@
  obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
  obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o
  obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o
 +obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
- obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
-diff -aurN linux-2.4.28-orig/net/ipv4/netfilter/ipt_IMQ.c linux-2.4.28/net/ipv4/netfilter/ipt_IMQ.c
---- linux-2.4.28-orig/net/ipv4/netfilter/ipt_IMQ.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.4.28/net/ipv4/netfilter/ipt_IMQ.c	2004-12-14 11:43:43.000000000 +0000
+ obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c	2007-12-15 05:20:10.812456409 +0100
 @@ -0,0 +1,78 @@
 +/* This target marks packets to be enqueued to an imq device */
 +#include <linux/module.h>
@@ -616,10 +628,11 @@ diff -aurN linux-2.4.28-orig/net/ipv4/netfilter/ipt_IMQ.c linux-2.4.28/net/ipv4/
 +module_init(init);
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
-diff -aurN linux-2.4.28-orig/net/ipv6/netfilter/Config.in linux-2.4.28/net/ipv6/netfilter/Config.in
---- linux-2.4.28-orig/net/ipv6/netfilter/Config.in	2003-06-13 14:51:39.000000000 +0000
-+++ linux-2.4.28/net/ipv6/netfilter/Config.in	2004-12-14 11:43:43.000000000 +0000
-@@ -71,6 +71,7 @@
+Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in	2007-12-15 05:20:09.300370243 +0100
++++ linux-2.4.35.4/net/ipv6/netfilter/Config.in	2007-12-15 05:20:10.816456638 +0100
+@@ -72,6 +72,7 @@
    if [ "$CONFIG_IP6_NF_MANGLE" != "n" ]; then
  #    dep_tristate '    TOS target support' CONFIG_IP6_NF_TARGET_TOS $CONFIG_IP_NF_MANGLE
      dep_tristate '    MARK target support' CONFIG_IP6_NF_TARGET_MARK $CONFIG_IP6_NF_MANGLE
@@ -627,10 +640,11 @@ diff -aurN linux-2.4.28-orig/net/ipv6/netfilter/Config.in linux-2.4.28/net/ipv6/
    fi
    #dep_tristate '  LOG target support' CONFIG_IP6_NF_TARGET_LOG $CONFIG_IP6_NF_IPTABLES
  fi
-diff -aurN linux-2.4.28-orig/net/ipv6/netfilter/Makefile linux-2.4.28/net/ipv6/netfilter/Makefile
---- linux-2.4.28-orig/net/ipv6/netfilter/Makefile	2003-06-13 14:51:39.000000000 +0000
-+++ linux-2.4.28/net/ipv6/netfilter/Makefile	2004-12-14 11:43:43.000000000 +0000
-@@ -28,6 +28,7 @@
+Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile	2007-12-15 05:20:09.304370470 +0100
++++ linux-2.4.35.4/net/ipv6/netfilter/Makefile	2007-12-15 05:20:10.816456638 +0100
+@@ -29,6 +29,7 @@
  obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
  obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
  obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o
@@ -638,9 +652,10 @@ diff -aurN linux-2.4.28-orig/net/ipv6/netfilter/Makefile linux-2.4.28/net/ipv6/n
  obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
  obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
  obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o
-diff -aurN linux-2.4.28-orig/net/ipv6/netfilter/ip6t_IMQ.c linux-2.4.28/net/ipv6/netfilter/ip6t_IMQ.c
---- linux-2.4.28-orig/net/ipv6/netfilter/ip6t_IMQ.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.4.28/net/ipv6/netfilter/ip6t_IMQ.c	2004-12-14 11:43:43.000000000 +0000
+Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c	2007-12-15 05:20:10.816456638 +0100
 @@ -0,0 +1,78 @@
 +/* This target marks packets to be enqueued to an imq device */
 +#include <linux/module.h>
@@ -720,9 +735,10 @@ diff -aurN linux-2.4.28-orig/net/ipv6/netfilter/ip6t_IMQ.c linux-2.4.28/net/ipv6
 +module_init(init);
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
-diff -aurN linux-2.4.28-orig/net/sched/sch_generic.c linux-2.4.28/net/sched/sch_generic.c
---- linux-2.4.28-orig/net/sched/sch_generic.c	2004-11-17 11:54:22.000000000 +0000
-+++ linux-2.4.28/net/sched/sch_generic.c	2004-12-14 11:44:27.000000000 +0000
+Index: linux-2.4.35.4/net/sched/sch_generic.c
+===================================================================
+--- linux-2.4.35.4.orig/net/sched/sch_generic.c	2007-12-15 05:19:37.226542457 +0100
++++ linux-2.4.35.4/net/sched/sch_generic.c	2007-12-15 05:20:10.816456638 +0100
 @@ -29,6 +29,9 @@
  #include <linux/skbuff.h>
  #include <linux/rtnetlink.h>
diff --git a/target/linux/generic-2.4/patches/617-netfilter_time.patch b/target/linux/generic-2.4/patches/617-netfilter_time.patch
index 3593571b46..1167e2b824 100644
--- a/target/linux/generic-2.4/patches/617-netfilter_time.patch
+++ b/target/linux/generic-2.4/patches/617-netfilter_time.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.4.32.orig/net/ipv4/netfilter/Config.in linux-2.4.32/net/ipv4/netfilter/Config.in
---- linux-2.4.32.orig/net/ipv4/netfilter/Config.in	2006-01-07 12:11:37.000000000 +0100
-+++ linux-2.4.32/net/ipv4/netfilter/Config.in	2006-01-07 12:15:45.000000000 +0100
-@@ -48,6 +48,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:10.812456409 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:11.208478976 +0100
+@@ -47,6 +47,7 @@
    dep_tristate '  netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
    dep_tristate '  Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES
    dep_tristate '  TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
@@ -9,9 +10,10 @@ diff -urN linux-2.4.32.orig/net/ipv4/netfilter/Config.in linux-2.4.32/net/ipv4/n
    dep_tristate '  condition match support' CONFIG_IP_NF_MATCH_CONDITION $CONFIG_IP_NF_IPTABLES
    dep_tristate '  recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
    dep_tristate '  ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES
-diff -urN linux-2.4.32.orig/net/ipv4/netfilter/ipt_time.c linux-2.4.32/net/ipv4/netfilter/ipt_time.c
---- linux-2.4.32.orig/net/ipv4/netfilter/ipt_time.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32/net/ipv4/netfilter/ipt_time.c	2006-01-07 12:14:32.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c	2007-12-15 05:20:11.212479205 +0100
 @@ -0,0 +1,193 @@
 +/*
 +  This is a module which is used for time matching
@@ -206,10 +208,11 @@ diff -urN linux-2.4.32.orig/net/ipv4/netfilter/ipt_time.c linux-2.4.32/net/ipv4/
 +	r->tm_mon=i;
 +	r->tm_mday=work-__spm[i]+1;
 +}
-diff -urN linux-2.4.32.orig/net/ipv4/netfilter/Makefile linux-2.4.32/net/ipv4/netfilter/Makefile
---- linux-2.4.32.orig/net/ipv4/netfilter/Makefile	2006-01-07 12:11:37.000000000 +0100
-+++ linux-2.4.32/net/ipv4/netfilter/Makefile	2006-01-07 12:16:07.000000000 +0100
-@@ -118,6 +118,7 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:10.812456409 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:11.216479434 +0100
+@@ -111,6 +111,7 @@
  obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
  obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o
  obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
@@ -217,9 +220,10 @@ diff -urN linux-2.4.32.orig/net/ipv4/netfilter/Makefile linux-2.4.32/net/ipv4/ne
  obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o
  
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
-diff -urN linux-2.4.32.orig/include/linux/netfilter_ipv4/ipt_time.h linux-2.4.32/include/linux/netfilter_ipv4/ipt_time.h
---- linux-2.4.32.orig/include/linux/netfilter_ipv4/ipt_time.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32/include/linux/netfilter_ipv4/ipt_time.h	2006-01-07 12:16:42.000000000 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_time.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_time.h	2007-12-15 05:20:11.216479434 +0100
 @@ -0,0 +1,15 @@
 +#ifndef __ipt_time_h_included__
 +#define __ipt_time_h_included__
diff --git a/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch b/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch
index c34f9ecbb7..68f9dab004 100644
--- a/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch
+++ b/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch
@@ -1,6 +1,7 @@
-diff -urN linux.old/include/linux/netfilter_ipv4/ipt_multiport.h linux.dev/include/linux/netfilter_ipv4/ipt_multiport.h
---- linux.old/include/linux/netfilter_ipv4/ipt_multiport.h	2000-12-11 22:31:30.000000000 +0100
-+++ linux.dev/include/linux/netfilter_ipv4/ipt_multiport.h	2006-02-04 05:23:54.318518250 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ipt_multiport.h	2007-12-15 05:19:37.022530833 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h	2007-12-15 05:20:11.456493111 +0100
 @@ -11,11 +11,12 @@
  
  #define IPT_MULTI_PORTS	15
@@ -16,9 +17,10 @@ diff -urN linux.old/include/linux/netfilter_ipv4/ipt_multiport.h linux.dev/inclu
 +	u_int8_t invert;			/* Invert flag */
  };
  #endif /*_IPT_MULTIPORT_H*/
-diff -urN linux.old/net/ipv4/netfilter/ipt_multiport.c linux.dev/net/ipv4/netfilter/ipt_multiport.c
---- linux.old/net/ipv4/netfilter/ipt_multiport.c	2003-06-13 16:51:39.000000000 +0200
-+++ linux.dev/net/ipv4/netfilter/ipt_multiport.c	2006-02-04 05:34:27.362081000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_multiport.c	2007-12-15 05:19:37.030531288 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c	2007-12-15 05:20:11.464493568 +0100
 @@ -1,5 +1,14 @@
  /* Kernel module to match one of a list of TCP/UDP ports: ports are in
     the same place so we can treat them as equal. */
diff --git a/target/linux/generic-2.4/patches/619-netfilter_classify.patch b/target/linux/generic-2.4/patches/619-netfilter_classify.patch
index c9f9392534..e4bceb95b7 100644
--- a/target/linux/generic-2.4/patches/619-netfilter_classify.patch
+++ b/target/linux/generic-2.4/patches/619-netfilter_classify.patch
@@ -1,6 +1,7 @@
-diff -uprN linux-2.4.32.reference/include/linux/netfilter_ipv4/ipt_CLASSIFY.h linux-2.4.32/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
---- linux-2.4.32.reference/include/linux/netfilter_ipv4/ipt_CLASSIFY.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32/include/linux/netfilter_ipv4/ipt_CLASSIFY.h	2006-08-17 12:33:08.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h	2007-12-15 05:20:11.684506105 +0100
 @@ -0,0 +1,8 @@
 +#ifndef _IPT_CLASSIFY_H
 +#define _IPT_CLASSIFY_H
@@ -10,10 +11,11 @@ diff -uprN linux-2.4.32.reference/include/linux/netfilter_ipv4/ipt_CLASSIFY.h li
 +};
 +
 +#endif /*_IPT_CLASSIFY_H */
-diff -uprN linux-2.4.32.reference/net/ipv4/netfilter/Config.in linux-2.4.32/net/ipv4/netfilter/Config.in
---- linux-2.4.32.reference/net/ipv4/netfilter/Config.in	2006-08-17 12:28:16.000000000 +0200
-+++ linux-2.4.32/net/ipv4/netfilter/Config.in	2006-08-17 12:33:08.000000000 +0200
-@@ -172,6 +172,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; 
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:11.208478976 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:11.688506331 +0100
+@@ -172,6 +172,7 @@
      dep_tristate '    DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE
   
      dep_tristate '    MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
@@ -21,9 +23,10 @@ diff -uprN linux-2.4.32.reference/net/ipv4/netfilter/Config.in linux-2.4.32/net/
      dep_tristate '    IMQ target support' CONFIG_IP_NF_TARGET_IMQ $CONFIG_IP_NF_MANGLE
    fi
    if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then
-diff -uprN linux-2.4.32.reference/net/ipv4/netfilter/ipt_CLASSIFY.c linux-2.4.32/net/ipv4/netfilter/ipt_CLASSIFY.c
---- linux-2.4.32.reference/net/ipv4/netfilter/ipt_CLASSIFY.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.32/net/ipv4/netfilter/ipt_CLASSIFY.c	2006-08-17 12:33:08.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c	2007-12-15 05:20:11.696506789 +0100
 @@ -0,0 +1,82 @@
 +/*
 + * This is a module which is used for setting the skb->priority field
@@ -107,10 +110,11 @@ diff -uprN linux-2.4.32.reference/net/ipv4/netfilter/ipt_CLASSIFY.c linux-2.4.32
 +
 +module_init(init);
 +module_exit(fini);
-diff -uprN linux-2.4.32.reference/net/ipv4/netfilter/Makefile linux-2.4.32/net/ipv4/netfilter/Makefile
---- linux-2.4.32.reference/net/ipv4/netfilter/Makefile	2006-08-17 12:28:16.000000000 +0200
-+++ linux-2.4.32/net/ipv4/netfilter/Makefile	2006-08-17 12:33:08.000000000 +0200
-@@ -134,6 +134,7 @@ obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:11.216479434 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:11.696506789 +0100
+@@ -134,6 +134,7 @@
  
  # targets
  obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
diff --git a/target/linux/generic-2.4/patches/620-netfilter_iprange.patch b/target/linux/generic-2.4/patches/620-netfilter_iprange.patch
index 32340d2da2..897226f66b 100644
--- a/target/linux/generic-2.4/patches/620-netfilter_iprange.patch
+++ b/target/linux/generic-2.4/patches/620-netfilter_iprange.patch
@@ -1,6 +1,7 @@
-diff -ruaN linux-2.4.34.orig/Documentation/Configure.help linux-2.4.34/Documentation/Configure.help
---- linux-2.4.34.orig/Documentation/Configure.help	2007-06-01 12:17:16.000000000 +0100
-+++ linux-2.4.34/Documentation/Configure.help	2007-06-01 12:20:20.000000000 +0100
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:20:10.792455269 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:20:11.948521148 +0100
 @@ -2986,6 +2986,14 @@
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
@@ -16,9 +17,10 @@ diff -ruaN linux-2.4.34.orig/Documentation/Configure.help linux-2.4.34/Documenta
  Condition variable match support
  CONFIG_IP_NF_MATCH_CONDITION
    This option allows you to match firewall rules against condition
-diff -ruaN linux-2.4.34.orig/include/linux/netfilter_ipv4/ipt_iprange.h linux-2.4.34/include/linux/netfilter_ipv4/ipt_iprange.h
---- linux-2.4.34.orig/include/linux/netfilter_ipv4/ipt_iprange.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.34/include/linux/netfilter_ipv4/ipt_iprange.h	2007-06-01 12:20:20.000000000 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h	2007-12-15 05:20:11.952521377 +0100
 @@ -0,0 +1,23 @@
 +#ifndef _IPT_IPRANGE_H
 +#define _IPT_IPRANGE_H
@@ -43,9 +45,10 @@ diff -ruaN linux-2.4.34.orig/include/linux/netfilter_ipv4/ipt_iprange.h linux-2.
 +};
 +
 +#endif /* _IPT_IPRANGE_H */
-diff -ruaN linux-2.4.34.orig/net/ipv4/netfilter/Config.in linux-2.4.34/net/ipv4/netfilter/Config.in
---- linux-2.4.34.orig/net/ipv4/netfilter/Config.in	2007-06-01 12:17:17.000000000 +0100
-+++ linux-2.4.34/net/ipv4/netfilter/Config.in	2007-06-01 12:20:20.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:11.688506331 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:11.960521836 +0100
 @@ -27,6 +27,7 @@
  if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
  # The simple matches.
@@ -54,9 +57,10 @@ diff -ruaN linux-2.4.34.orig/net/ipv4/netfilter/Config.in linux-2.4.34/net/ipv4/
    dep_tristate '  quota match support' CONFIG_IP_NF_MATCH_QUOTA $CONFIG_IP_NF_IPTABLES
  
    dep_tristate '  IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES
-diff -ruaN linux-2.4.34.orig/net/ipv4/netfilter/ipt_iprange.c linux-2.4.34/net/ipv4/netfilter/ipt_iprange.c
---- linux-2.4.34.orig/net/ipv4/netfilter/ipt_iprange.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.34/net/ipv4/netfilter/ipt_iprange.c	2007-06-01 12:20:20.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c	2007-12-15 05:20:11.964522063 +0100
 @@ -0,0 +1,101 @@
 +/*
 + * iptables module to match IP address ranges
@@ -159,9 +163,10 @@ diff -ruaN linux-2.4.34.orig/net/ipv4/netfilter/ipt_iprange.c linux-2.4.34/net/i
 +
 +module_init(init);
 +module_exit(fini);
-diff -ruaN linux-2.4.34.orig/net/ipv4/netfilter/Makefile linux-2.4.34/net/ipv4/netfilter/Makefile
---- linux-2.4.34.orig/net/ipv4/netfilter/Makefile	2007-06-01 12:17:17.000000000 +0100
-+++ linux-2.4.34/net/ipv4/netfilter/Makefile	2007-06-01 12:20:20.000000000 +0100
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:11.696506789 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:11.976522746 +0100
 @@ -90,6 +90,7 @@
  # matches
  obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
diff --git a/target/linux/generic-2.4/patches/621-netfilter_random.patch b/target/linux/generic-2.4/patches/621-netfilter_random.patch
index 1ee85be46f..70c528e8e2 100644
--- a/target/linux/generic-2.4/patches/621-netfilter_random.patch
+++ b/target/linux/generic-2.4/patches/621-netfilter_random.patch
@@ -1,7 +1,8 @@
-diff -Naurp linux-2.4.34/Documentation/Configure.help linux-2.4.34.patched/Documentation/Configure.help
---- linux-2.4.34/Documentation/Configure.help	2007-07-08 05:01:42.000000000 +0200
-+++ linux-2.4.34.patched/Documentation/Configure.help	2007-07-08 05:02:26.000000000 +0200
-@@ -2914,6 +2914,15 @@ CONFIG_IP_NF_MATCH_MAC
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:20:11.948521148 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:20:12.260538930 +0100
+@@ -2914,6 +2914,15 @@
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
  
@@ -17,7 +18,7 @@ diff -Naurp linux-2.4.34/Documentation/Configure.help linux-2.4.34.patched/Docum
  Netfilter MARK match support
  CONFIG_IP_NF_MATCH_MARK
    Netfilter mark matching allows you to match packets based on the
-@@ -3221,6 +3230,7 @@ CONFIG_IP_NF_MATCH_HELPER
+@@ -3229,6 +3238,7 @@
    If you want to compile it as a module, say M here and read
    Documentation/modules.txt.  If unsure, say `Y'.
  
@@ -25,7 +26,7 @@ diff -Naurp linux-2.4.34/Documentation/Configure.help linux-2.4.34.patched/Docum
  TCPMSS match support
  CONFIG_IP_NF_MATCH_TCPMSS
    This option adds a `tcpmss' match, which allows you to examine the
-@@ -3299,6 +3309,14 @@ CONFIG_IP6_NF_MATCH_MAC
+@@ -3376,6 +3386,14 @@
    If you want to compile it as a module, say M here and read
    <file:Documentation/modules.txt>.  If unsure, say `N'.
  
@@ -40,9 +41,10 @@ diff -Naurp linux-2.4.34/Documentation/Configure.help linux-2.4.34.patched/Docum
  length match support
  CONFIG_IP6_NF_MATCH_LENGTH
    This option allows you to match the length of a packet against a
-diff -Naurp linux-2.4.34/include/linux/netfilter_ipv4/ipt_random.h linux-2.4.34.patched/include/linux/netfilter_ipv4/ipt_random.h
---- linux-2.4.34/include/linux/netfilter_ipv4/ipt_random.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.34.patched/include/linux/netfilter_ipv4/ipt_random.h	2007-07-08 05:02:26.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h	2007-12-15 05:20:12.264539159 +0100
 @@ -0,0 +1,11 @@
 +#ifndef _IPT_RAND_H
 +#define _IPT_RAND_H
@@ -55,9 +57,10 @@ diff -Naurp linux-2.4.34/include/linux/netfilter_ipv4/ipt_random.h linux-2.4.34.
 +};
 +
 +#endif /*_IPT_RAND_H*/
-diff -Naurp linux-2.4.34/include/linux/netfilter_ipv6/ip6t_random.h linux-2.4.34.patched/include/linux/netfilter_ipv6/ip6t_random.h
---- linux-2.4.34/include/linux/netfilter_ipv6/ip6t_random.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.34.patched/include/linux/netfilter_ipv6/ip6t_random.h	2007-07-08 05:02:26.000000000 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h	2007-12-15 05:20:12.272539617 +0100
 @@ -0,0 +1,11 @@
 +#ifndef _IP6T_RAND_H
 +#define _IP6T_RAND_H
@@ -70,10 +73,11 @@ diff -Naurp linux-2.4.34/include/linux/netfilter_ipv6/ip6t_random.h linux-2.4.34
 +};
 +
 +#endif /*_IP6T_RAND_H*/
-diff -Naurp linux-2.4.34/net/ipv4/netfilter/Config.in linux-2.4.34.patched/net/ipv4/netfilter/Config.in
---- linux-2.4.34/net/ipv4/netfilter/Config.in	2007-07-08 05:01:42.000000000 +0200
-+++ linux-2.4.34.patched/net/ipv4/netfilter/Config.in	2007-07-08 05:03:32.000000000 +0200
-@@ -32,6 +32,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; 
+Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in	2007-12-15 05:20:11.960521836 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in	2007-12-15 05:20:12.276539844 +0100
+@@ -48,6 +48,7 @@
    dep_tristate '  netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
    dep_tristate '  Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES
    dep_tristate '  TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
@@ -81,9 +85,10 @@ diff -Naurp linux-2.4.34/net/ipv4/netfilter/Config.in linux-2.4.34.patched/net/i
    dep_tristate '  TIME match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_TIME $CONFIG_IP_NF_IPTABLES
    dep_tristate '  condition match support' CONFIG_IP_NF_MATCH_CONDITION $CONFIG_IP_NF_IPTABLES
    dep_tristate '  recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
-diff -Naurp linux-2.4.34/net/ipv4/netfilter/ipt_random.c linux-2.4.34.patched/net/ipv4/netfilter/ipt_random.c
---- linux-2.4.34/net/ipv4/netfilter/ipt_random.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.34.patched/net/ipv4/netfilter/ipt_random.c	2007-07-08 05:02:26.000000000 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c	2007-12-15 05:20:12.276539844 +0100
 @@ -0,0 +1,96 @@
 +/*
 +  This is a module which is used for a "random" match support.
@@ -181,10 +186,11 @@ diff -Naurp linux-2.4.34/net/ipv4/netfilter/ipt_random.c linux-2.4.34.patched/ne
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naurp linux-2.4.34/net/ipv4/netfilter/Makefile linux-2.4.34.patched/net/ipv4/netfilter/Makefile
---- linux-2.4.34/net/ipv4/netfilter/Makefile	2007-07-08 05:01:42.000000000 +0200
-+++ linux-2.4.34.patched/net/ipv4/netfilter/Makefile	2007-07-08 05:02:26.000000000 +0200
-@@ -102,6 +102,8 @@ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos
+Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile	2007-12-15 05:20:11.976522746 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile	2007-12-15 05:20:12.276539844 +0100
+@@ -115,6 +115,8 @@
  obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o
  obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o
  
@@ -193,10 +199,11 @@ diff -Naurp linux-2.4.34/net/ipv4/netfilter/Makefile linux-2.4.34.patched/net/ip
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  
  obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
-diff -Naurp linux-2.4.34/net/ipv6/netfilter/Config.in linux-2.4.34.patched/net/ipv6/netfilter/Config.in
---- linux-2.4.34/net/ipv6/netfilter/Config.in	2007-07-08 05:01:42.000000000 +0200
-+++ linux-2.4.34.patched/net/ipv6/netfilter/Config.in	2007-07-08 05:02:26.000000000 +0200
-@@ -19,6 +19,7 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ];
+Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in	2007-12-15 05:20:10.816456638 +0100
++++ linux-2.4.35.4/net/ipv6/netfilter/Config.in	2007-12-15 05:20:12.276539844 +0100
+@@ -19,6 +19,7 @@
    dep_tristate '  limit match support' CONFIG_IP6_NF_MATCH_LIMIT $CONFIG_IP6_NF_IPTABLES
    dep_tristate '  condition match support' CONFIG_IP6_NF_MATCH_CONDITION $CONFIG_IP6_NF_IPTABLES
    dep_tristate '  MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES
@@ -204,9 +211,10 @@ diff -Naurp linux-2.4.34/net/ipv6/netfilter/Config.in linux-2.4.34.patched/net/i
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
      dep_tristate '  Routing header match support (EXPERIMENTAL)' CONFIG_IP6_NF_MATCH_RT $CONFIG_IP6_NF_IPTABLES
    fi
-diff -Naurp linux-2.4.34/net/ipv6/netfilter/ip6t_random.c linux-2.4.34.patched/net/ipv6/netfilter/ip6t_random.c
---- linux-2.4.34/net/ipv6/netfilter/ip6t_random.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.34.patched/net/ipv6/netfilter/ip6t_random.c	2007-07-08 05:02:26.000000000 +0200
+Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c	2007-12-15 05:20:12.276539844 +0100
 @@ -0,0 +1,97 @@
 +/*
 +  This is a module which is used for a "random" match support.
@@ -305,10 +313,11 @@ diff -Naurp linux-2.4.34/net/ipv6/netfilter/ip6t_random.c linux-2.4.34.patched/n
 +
 +module_init(init);
 +module_exit(fini);
-diff -Naurp linux-2.4.34/net/ipv6/netfilter/Makefile linux-2.4.34.patched/net/ipv6/netfilter/Makefile
---- linux-2.4.34/net/ipv6/netfilter/Makefile	2007-07-08 05:01:42.000000000 +0200
-+++ linux-2.4.34.patched/net/ipv6/netfilter/Makefile	2007-07-08 05:02:26.000000000 +0200
-@@ -32,6 +32,7 @@ obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t
+Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile	2007-12-15 05:20:10.816456638 +0100
++++ linux-2.4.35.4/net/ipv6/netfilter/Makefile	2007-12-15 05:20:12.280540069 +0100
+@@ -32,6 +32,7 @@
  obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
  obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
  obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
diff --git a/target/linux/generic-2.4/patches/621-tc_esfq.patch b/target/linux/generic-2.4/patches/621-tc_esfq.patch
index f4b9a6edda..86935a82b4 100644
--- a/target/linux/generic-2.4/patches/621-tc_esfq.patch
+++ b/target/linux/generic-2.4/patches/621-tc_esfq.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.4.34/Documentation/Configure.help linux-2.4.34/Documentation/Configure.help
---- linux-2.4.34/Documentation/Configure.help	2007-05-10 19:37:42.000000000 -0400
-+++ linux-2.4.34/Documentation/Configure.help	2007-05-10 19:49:49.000000000 -0400
-@@ -11127,6 +11127,24 @@
+Index: linux-2.4.35.4/Documentation/Configure.help
+===================================================================
+--- linux-2.4.35.4.orig/Documentation/Configure.help	2007-12-15 05:20:12.260538930 +0100
++++ linux-2.4.35.4/Documentation/Configure.help	2007-12-15 05:20:12.604558535 +0100
+@@ -11153,6 +11153,24 @@
    whenever you want).  If you want to compile it as a module, say M
    here and read <file:Documentation/modules.txt>.
  
@@ -26,9 +27,10 @@ diff -urN linux-2.4.34/Documentation/Configure.help linux-2.4.34/Documentation/C
  CSZ packet scheduler
  CONFIG_NET_SCH_CSZ
    Say Y here if you want to use the Clark-Shenker-Zhang (CSZ) packet
-diff -urN linux-2.4.34/include/linux/pkt_sched.h linux-2.4.34/include/linux/pkt_sched.h
---- linux-2.4.34/include/linux/pkt_sched.h	2007-05-10 19:38:19.000000000 -0400
-+++ linux-2.4.34/include/linux/pkt_sched.h	2007-05-10 19:53:59.000000000 -0400
+Index: linux-2.4.35.4/include/linux/pkt_sched.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/pkt_sched.h	2007-12-15 05:19:36.750515331 +0100
++++ linux-2.4.35.4/include/linux/pkt_sched.h	2007-12-15 05:20:12.608558764 +0100
 @@ -173,8 +173,36 @@
   *
   *	The only reason for this is efficiency, it is possible
@@ -66,9 +68,10 @@ diff -urN linux-2.4.34/include/linux/pkt_sched.h linux-2.4.34/include/linux/pkt_
  /* RED section */
  
  enum
-diff -urN linux-2.4.34/net/sched/Config.in linux-2.4.34/net/sched/Config.in
---- linux-2.4.34/net/sched/Config.in	2007-05-10 19:38:31.000000000 -0400
-+++ linux-2.4.34/net/sched/Config.in	2007-05-10 19:54:45.000000000 -0400
+Index: linux-2.4.35.4/net/sched/Config.in
+===================================================================
+--- linux-2.4.35.4.orig/net/sched/Config.in	2007-12-15 05:19:36.758515786 +0100
++++ linux-2.4.35.4/net/sched/Config.in	2007-12-15 05:20:12.608558764 +0100
 @@ -12,6 +12,7 @@
  tristate '  The simplest PRIO pseudoscheduler' CONFIG_NET_SCH_PRIO
  tristate '  RED queue' CONFIG_NET_SCH_RED
@@ -77,9 +80,10 @@ diff -urN linux-2.4.34/net/sched/Config.in linux-2.4.34/net/sched/Config.in
  tristate '  TEQL queue' CONFIG_NET_SCH_TEQL
  tristate '  TBF queue' CONFIG_NET_SCH_TBF
  tristate '  GRED queue' CONFIG_NET_SCH_GRED
-diff -urN linux-2.4.34/net/sched/Makefile linux-2.4.34/net/sched/Makefile
---- linux-2.4.34/net/sched/Makefile	2007-05-10 19:38:31.000000000 -0400
-+++ linux-2.4.34/net/sched/Makefile	2007-05-10 19:55:13.000000000 -0400
+Index: linux-2.4.35.4/net/sched/Makefile
+===================================================================
+--- linux-2.4.35.4.orig/net/sched/Makefile	2007-12-15 05:19:36.766516242 +0100
++++ linux-2.4.35.4/net/sched/Makefile	2007-12-15 05:20:12.608558764 +0100
 @@ -19,6 +19,7 @@
  obj-$(CONFIG_NET_SCH_HFSC)	+= sch_hfsc.o
  obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
@@ -88,9 +92,10 @@ diff -urN linux-2.4.34/net/sched/Makefile linux-2.4.34/net/sched/Makefile
  obj-$(CONFIG_NET_SCH_RED)	+= sch_red.o
  obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
  obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
-diff -urN linux-2.4.34/net/sched/sch_esfq.c linux-2.4.34/net/sched/sch_esfq.c
---- linux-2.4.34/net/sched/sch_esfq.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.4.34/net/sched/sch_esfq.c	2007-05-10 19:57:15.000000000 -0400
+Index: linux-2.4.35.4/net/sched/sch_esfq.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/net/sched/sch_esfq.c	2007-12-15 05:20:12.608558764 +0100
 @@ -0,0 +1,649 @@
 +/*
 + * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
diff --git a/target/linux/generic-2.4/patches/622-netfilter_ipset_porthash.patch b/target/linux/generic-2.4/patches/622-netfilter_ipset_porthash.patch
index 86a7f1cdf7..b0cba8f264 100644
--- a/target/linux/generic-2.4/patches/622-netfilter_ipset_porthash.patch
+++ b/target/linux/generic-2.4/patches/622-netfilter_ipset_porthash.patch
@@ -1,6 +1,7 @@
-diff -ruN linux-2.4.34.orig/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.4.34/include/linux/netfilter_ipv4/ip_set_ipporthash.h
---- linux-2.4.34.orig/include/linux/netfilter_ipv4/ip_set_ipporthash.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.34/include/linux/netfilter_ipv4/ip_set_ipporthash.h	2006-12-31 18:32:57.183171722 +0100
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h	2007-12-15 05:20:12.884574492 +0100
 @@ -0,0 +1,34 @@
 +#ifndef __IP_SET_IPPORTHASH_H
 +#define __IP_SET_IPPORTHASH_H
diff --git a/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch b/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch
index 46407c85f2..7b4e48f720 100644
--- a/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch
+++ b/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch
@@ -1,6 +1,7 @@
-diff -ur v2.4.29/linux/include/linux/netfilter_ipv4/ip_nat.h linux/include/linux/netfilter_ipv4/ip_nat.h
---- v2.4.29/linux/include/linux/netfilter_ipv4/ip_nat.h	2005-01-20 09:25:34.000000000 +0200
-+++ linux/include/linux/netfilter_ipv4/ip_nat.h	2005-01-20 09:55:46.998651976 +0200
+Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_nat.h	2007-12-15 05:19:36.574505299 +0100
++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h	2007-12-15 05:20:13.092586349 +0100
 @@ -121,5 +121,13 @@
  extern u_int16_t ip_nat_cheat_check(u_int32_t oldvalinv,
  				    u_int32_t newval,
@@ -15,9 +16,10 @@ diff -ur v2.4.29/linux/include/linux/netfilter_ipv4/ip_nat.h linux/include/linux
 +
  #endif /*__KERNEL__*/
  #endif
-diff -ur v2.4.29/linux/include/linux/rtnetlink.h linux/include/linux/rtnetlink.h
---- v2.4.29/linux/include/linux/rtnetlink.h	2004-08-08 10:56:48.000000000 +0300
-+++ linux/include/linux/rtnetlink.h	2005-01-20 09:55:33.431714464 +0200
+Index: linux-2.4.35.4/include/linux/rtnetlink.h
+===================================================================
+--- linux-2.4.35.4.orig/include/linux/rtnetlink.h	2007-12-15 05:19:36.582505757 +0100
++++ linux-2.4.35.4/include/linux/rtnetlink.h	2007-12-15 05:20:13.092586349 +0100
 @@ -234,6 +234,8 @@
  #define RTNH_F_DEAD		1	/* Nexthop is dead (used by multipath)	*/
  #define RTNH_F_PERVASIVE	2	/* Do recursive gateway lookup	*/
@@ -27,9 +29,10 @@ diff -ur v2.4.29/linux/include/linux/rtnetlink.h linux/include/linux/rtnetlink.h
  
  /* Macros to handle hexthops */
  
-diff -ur v2.4.29/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
---- v2.4.29/linux/include/net/ip_fib.h	2001-11-13 03:24:05.000000000 +0200
-+++ linux/include/net/ip_fib.h	2005-01-20 09:55:33.432714312 +0200
+Index: linux-2.4.35.4/include/net/ip_fib.h
+===================================================================
+--- linux-2.4.35.4.orig/include/net/ip_fib.h	2007-12-15 05:19:36.590506213 +0100
++++ linux-2.4.35.4/include/net/ip_fib.h	2007-12-15 05:20:13.100586801 +0100
 @@ -162,7 +162,8 @@
  
  static inline void fib_select_default(const struct rt_key *key, struct fib_result *res)
@@ -55,9 +58,10 @@ diff -ur v2.4.29/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
 +extern rwlock_t fib_nhflags_lock;
  
  #endif  /* _NET_FIB_H */
-diff -ur v2.4.29/linux/include/net/route.h linux/include/net/route.h
---- v2.4.29/linux/include/net/route.h	2003-08-25 22:06:13.000000000 +0300
-+++ linux/include/net/route.h	2005-01-20 09:55:46.999651824 +0200
+Index: linux-2.4.35.4/include/net/route.h
+===================================================================
+--- linux-2.4.35.4.orig/include/net/route.h	2007-12-15 05:19:36.598506668 +0100
++++ linux-2.4.35.4/include/net/route.h	2007-12-15 05:20:13.104587030 +0100
 @@ -49,6 +49,8 @@
  {
  	__u32			dst;
@@ -91,9 +95,10 @@ diff -ur v2.4.29/linux/include/net/route.h linux/include/net/route.h
  static inline void ip_rt_put(struct rtable * rt)
  {
  	if (rt)
-diff -ur v2.4.29/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
---- v2.4.29/linux/net/ipv4/fib_frontend.c	2003-08-25 22:06:13.000000000 +0300
-+++ linux/net/ipv4/fib_frontend.c	2005-01-20 09:55:46.999651824 +0200
+Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/fib_frontend.c	2007-12-15 05:19:36.606507123 +0100
++++ linux-2.4.35.4/net/ipv4/fib_frontend.c	2007-12-15 05:20:13.108587259 +0100
 @@ -54,6 +54,8 @@
  struct fib_table *local_table;
  struct fib_table *main_table;
@@ -192,9 +197,10 @@ diff -ur v2.4.29/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
  		rt_cache_flush(-1);
  		break;
  	case NETDEV_DOWN:
-diff -ur v2.4.29/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
---- v2.4.29/linux/net/ipv4/fib_hash.c	2003-08-25 22:06:13.000000000 +0300
-+++ linux/net/ipv4/fib_hash.c	2005-01-20 09:55:47.000651672 +0200
+Index: linux-2.4.35.4/net/ipv4/fib_hash.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/fib_hash.c	2007-12-15 05:19:36.614507579 +0100
++++ linux-2.4.35.4/net/ipv4/fib_hash.c	2007-12-15 05:20:13.108587259 +0100
 @@ -71,6 +71,7 @@
  	struct fib_info		*fn_info;
  #define FIB_INFO(f)	((f)->fn_info)
@@ -408,9 +414,10 @@ diff -ur v2.4.29/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
  	new_f->fn_key = key;
  #ifdef CONFIG_IP_ROUTE_TOS
  	new_f->fn_tos = tos;
-diff -ur v2.4.29/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
---- v2.4.29/linux/net/ipv4/fib_rules.c	2004-02-19 00:23:39.000000000 +0200
-+++ linux/net/ipv4/fib_rules.c	2005-01-20 09:55:33.433714160 +0200
+Index: linux-2.4.35.4/net/ipv4/fib_rules.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/fib_rules.c	2007-12-15 05:19:36.618507808 +0100
++++ linux-2.4.35.4/net/ipv4/fib_rules.c	2007-12-15 05:20:13.108587259 +0100
 @@ -307,6 +307,11 @@
  	}
  }
@@ -436,9 +443,10 @@ diff -ur v2.4.29/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
  		struct fib_table *tb;
  		if ((tb = fib_get_table(res->r->r_table)) != NULL)
  			tb->tb_select_default(tb, key, res);
-diff -ur v2.4.29/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
---- v2.4.29/linux/net/ipv4/fib_semantics.c	2003-08-25 22:06:13.000000000 +0300
-+++ linux/net/ipv4/fib_semantics.c	2005-01-20 09:55:47.000651672 +0200
+Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/fib_semantics.c	2007-12-15 05:19:36.626508263 +0100
++++ linux-2.4.35.4/net/ipv4/fib_semantics.c	2007-12-15 05:20:13.112587489 +0100
 @@ -48,6 +48,7 @@
  static struct fib_info 	*fib_info_list;
  static rwlock_t fib_info_lock = RW_LOCK_UNLOCKED;
@@ -558,7 +566,7 @@ diff -ur v2.4.29/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  		}
  		nh->nh_dev = in_dev->dev;
  		dev_hold(nh->nh_dev);
-@@ -603,8 +635,12 @@
+@@ -606,8 +638,12 @@
  			for_nexthops(fi) {
  				if (nh->nh_flags&RTNH_F_DEAD)
  					continue;
@@ -573,7 +581,7 @@ diff -ur v2.4.29/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  			}
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
  			if (nhsel < fi->fib_nhs) {
-@@ -870,22 +906,35 @@
+@@ -873,22 +909,35 @@
  		if (local && fi->fib_prefsrc == local) {
  			fi->fib_flags |= RTNH_F_DEAD;
  			ret++;
@@ -618,7 +626,7 @@ diff -ur v2.4.29/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  				}
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
  				if (force > 1 && nh->nh_dev == dev) {
-@@ -903,37 +952,55 @@
+@@ -906,37 +955,55 @@
  	return ret;
  }
  
@@ -682,7 +690,7 @@ diff -ur v2.4.29/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  		} endfor_nexthops(fi)
  
  		if (alive > 0) {
-@@ -941,9 +1008,13 @@
+@@ -944,9 +1011,13 @@
  			ret++;
  		}
  	} endfor_fib_info();
@@ -696,7 +704,7 @@ diff -ur v2.4.29/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  /*
     The algorithm is suboptimal, but it provides really
     fair weighted route distribution.
-@@ -952,24 +1023,45 @@
+@@ -955,24 +1026,45 @@
  void fib_select_multipath(const struct rt_key *key, struct fib_result *res)
  {
  	struct fib_info *fi = res->fi;
@@ -750,7 +758,7 @@ diff -ur v2.4.29/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  	}
  
  
-@@ -979,20 +1071,40 @@
+@@ -982,20 +1074,40 @@
  
  	w = jiffies % fi->fib_power;
  
@@ -794,9 +802,10 @@ diff -ur v2.4.29/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  	spin_unlock_bh(&fib_multipath_lock);
  }
  #endif
-diff -ur v2.4.29/linux/net/ipv4/ip_nat_dumb.c linux/net/ipv4/ip_nat_dumb.c
---- v2.4.29/linux/net/ipv4/ip_nat_dumb.c	2001-11-13 03:25:26.000000000 +0200
-+++ linux/net/ipv4/ip_nat_dumb.c	2005-01-20 09:55:47.001651520 +0200
+Index: linux-2.4.35.4/net/ipv4/ip_nat_dumb.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/ip_nat_dumb.c	2007-12-15 05:19:36.634508719 +0100
++++ linux-2.4.35.4/net/ipv4/ip_nat_dumb.c	2007-12-15 05:20:13.112587489 +0100
 @@ -124,6 +124,7 @@
  					key.dst = ciph->saddr;
  					key.iif = skb->dev->ifindex;
@@ -805,9 +814,10 @@ diff -ur v2.4.29/linux/net/ipv4/ip_nat_dumb.c linux/net/ipv4/ip_nat_dumb.c
  #ifdef CONFIG_IP_ROUTE_TOS
  					key.tos = RT_TOS(ciph->tos);
  #endif
-diff -ur v2.4.29/linux/net/ipv4/netfilter/ip_fw_compat_masq.c linux/net/ipv4/netfilter/ip_fw_compat_masq.c
---- v2.4.29/linux/net/ipv4/netfilter/ip_fw_compat_masq.c	2005-01-20 09:25:34.000000000 +0200
-+++ linux/net/ipv4/netfilter/ip_fw_compat_masq.c	2005-01-20 09:55:47.001651520 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_fw_compat_masq.c	2007-12-15 05:19:36.642509177 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c	2007-12-15 05:20:13.112587489 +0100
 @@ -41,6 +41,10 @@
  	enum ip_conntrack_info ctinfo;
  	struct ip_conntrack *ct;
@@ -885,9 +895,10 @@ diff -ur v2.4.29/linux/net/ipv4/netfilter/ip_fw_compat_masq.c linux/net/ipv4/net
  }
  
  void
-diff -ur v2.4.29/linux/net/ipv4/netfilter/ip_nat_core.c linux/net/ipv4/netfilter/ip_nat_core.c
---- v2.4.29/linux/net/ipv4/netfilter/ip_nat_core.c	2005-01-20 09:25:34.000000000 +0200
-+++ linux/net/ipv4/netfilter/ip_nat_core.c	2005-01-20 09:55:47.002651368 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_core.c	2007-12-15 05:20:06.404205198 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c	2007-12-15 05:20:13.112587489 +0100
 @@ -994,6 +994,60 @@
  	return NF_ACCEPT;
  }
@@ -949,10 +960,11 @@ diff -ur v2.4.29/linux/net/ipv4/netfilter/ip_nat_core.c linux/net/ipv4/netfilter
  int __init ip_nat_init(void)
  {
  	size_t i;
-diff -ur v2.4.29/linux/net/ipv4/netfilter/ip_nat_standalone.c linux/net/ipv4/netfilter/ip_nat_standalone.c
---- v2.4.29/linux/net/ipv4/netfilter/ip_nat_standalone.c	2005-01-20 09:25:34.000000000 +0200
-+++ linux/net/ipv4/netfilter/ip_nat_standalone.c	2005-01-20 09:55:47.002651368 +0200
-@@ -241,6 +241,9 @@
+Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_standalone.c	2007-12-15 05:19:36.654509858 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c	2007-12-15 05:20:13.112587489 +0100
+@@ -245,6 +245,9 @@
  /* Before packet filtering, change destination */
  static struct nf_hook_ops ip_nat_in_ops
  = { { NULL, NULL }, ip_nat_in, PF_INET, NF_IP_PRE_ROUTING, NF_IP_PRI_NAT_DST };
@@ -962,7 +974,7 @@ diff -ur v2.4.29/linux/net/ipv4/netfilter/ip_nat_standalone.c linux/net/ipv4/net
  /* After packet filtering, change source */
  static struct nf_hook_ops ip_nat_out_ops
  = { { NULL, NULL }, ip_nat_out, PF_INET, NF_IP_POST_ROUTING, NF_IP_PRI_NAT_SRC};
-@@ -309,10 +312,15 @@
+@@ -313,10 +316,15 @@
  		printk("ip_nat_init: can't register in hook.\n");
  		goto cleanup_nat;
  	}
@@ -979,7 +991,7 @@ diff -ur v2.4.29/linux/net/ipv4/netfilter/ip_nat_standalone.c linux/net/ipv4/net
  	}
  	ret = nf_register_hook(&ip_nat_local_out_ops);
  	if (ret < 0) {
-@@ -332,6 +340,8 @@
+@@ -336,6 +344,8 @@
  	nf_unregister_hook(&ip_nat_local_out_ops);
   cleanup_outops:
  	nf_unregister_hook(&ip_nat_out_ops);
@@ -988,9 +1000,10 @@ diff -ur v2.4.29/linux/net/ipv4/netfilter/ip_nat_standalone.c linux/net/ipv4/net
   cleanup_inops:
  	nf_unregister_hook(&ip_nat_in_ops);
   cleanup_nat:
-diff -ur v2.4.29/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfilter/ipt_MASQUERADE.c
---- v2.4.29/linux/net/ipv4/netfilter/ipt_MASQUERADE.c	2005-01-20 09:25:34.000000000 +0200
-+++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c	2005-01-20 09:55:47.003651216 +0200
+Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_MASQUERADE.c	2007-12-15 05:19:36.662510316 +0100
++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c	2007-12-15 05:20:13.116587715 +0100
 @@ -87,7 +87,8 @@
  	key.dst = (*pskb)->nh.iph->daddr;
  	key.src = 0; /* Unknown: that's what we're trying to establish */
@@ -1015,9 +1028,10 @@ diff -ur v2.4.29/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfil
  
  	newsrc = rt->rt_src;
  	DEBUGP("newsrc = %u.%u.%u.%u\n", NIPQUAD(newsrc));
-diff -ur v2.4.29/linux/net/ipv4/route.c linux/net/ipv4/route.c
---- v2.4.29/linux/net/ipv4/route.c	2004-11-18 08:30:33.000000000 +0200
-+++ linux/net/ipv4/route.c	2005-01-20 09:55:47.004651064 +0200
+Index: linux-2.4.35.4/net/ipv4/route.c
+===================================================================
+--- linux-2.4.35.4.orig/net/ipv4/route.c	2007-12-15 05:19:36.670510772 +0100
++++ linux-2.4.35.4/net/ipv4/route.c	2007-12-15 05:20:13.116587715 +0100
 @@ -919,6 +919,7 @@
  
  				/* Gateway is different ... */
@@ -1286,9 +1300,10 @@ diff -ur v2.4.29/linux/net/ipv4/route.c linux/net/ipv4/route.c
  #ifdef CONFIG_IP_ROUTE_FWMARK
  		    rth->key.fwmark == key->fwmark &&
  #endif
-diff -ur v2.4.29/linux/net/netsyms.c linux/net/netsyms.c
---- v2.4.29/linux/net/netsyms.c	2005-01-20 09:25:34.000000000 +0200
-+++ linux/net/netsyms.c	2005-01-20 09:55:47.005650912 +0200
+Index: linux-2.4.35.4/net/netsyms.c
+===================================================================
+--- linux-2.4.35.4.orig/net/netsyms.c	2007-12-15 05:19:36.678511227 +0100
++++ linux-2.4.35.4/net/netsyms.c	2007-12-15 05:20:13.120587941 +0100
 @@ -260,6 +260,7 @@
  EXPORT_SYMBOL(inet_unregister_protosw);
  EXPORT_SYMBOL(ip_route_output_key);
diff --git a/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch
index b0d5facc44..035d5bdb31 100644
--- a/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch
@@ -1,12 +1,14 @@
---- linux-2.4.34-old/drivers/usb/serial/usbserial.c	2007-08-27 15:32:14.000000000 +0200
-+++ linux-2.4.34-new/drivers/usb/serial/usbserial.c	2007-09-02 14:10:52.000000000 +0200
+Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c	2007-12-15 05:19:36.542503478 +0100
++++ linux-2.4.35.4/drivers/usb/serial/usbserial.c	2007-12-15 05:20:13.496609372 +0100
 @@ -331,6 +331,7 @@
  #ifdef CONFIG_USB_SERIAL_GENERIC
  static __u16	vendor	= 0x05f9;
  static __u16	product	= 0xffff;
 +static int	maxSize = 0;
  
- static struct usb_device_id generic_device_ids[9]; /* Initially all zeroes. */
+ static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
  
 @@ -1557,7 +1558,11 @@
  			err("No free urbs available");
@@ -20,7 +22,7 @@
  		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
  		port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
  		if (!port->bulk_in_buffer) {
-@@ -1945,4 +1950,7 @@
+@@ -1921,4 +1926,7 @@
  
  MODULE_PARM(product, "h");
  MODULE_PARM_DESC(product, "User specified USB idProduct");
diff --git a/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch
index fbbb95883c..a1828f8312 100644
--- a/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch
+++ b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch
@@ -1,15 +1,17 @@
---- linux/drivers/usb/serial/usbserial.c.old	2006-05-15 18:16:55.000000000 +0300
-+++ linux/drivers/usb/serial/usbserial.c	2006-05-15 18:19:06.000000000 +0300
-@@ -332,7 +332,7 @@
- static __u16	vendor	= 0x05f9;
+Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c	2007-12-15 05:20:13.496609372 +0100
++++ linux-2.4.35.4/drivers/usb/serial/usbserial.c	2007-12-15 05:20:13.708621453 +0100
+@@ -333,7 +333,7 @@
  static __u16	product	= 0xffff;
+ static int	maxSize = 0;
  
 -static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
 +static struct usb_device_id generic_device_ids[10]; /* Initially all zeroes. */
  
  /* All of the device info needed for the Generic Serial Converter */
  static struct usb_serial_device_type generic_device = {
-@@ -1793,6 +1793,34 @@
+@@ -1836,6 +1836,34 @@
  	generic_device_ids[0].idVendor = vendor;
  	generic_device_ids[0].idProduct = product;
  	generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
author	nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2008-01-06 19:28:07 +0000
committer	nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2008-01-06 19:28:07 +0000
commit	90fba37c49479ed4e5233dc0d348cdf7d24c9ee1 (patch)
tree	58af9e3b3204308a2b7853127331f4d693e1b744 /target/linux/generic-2.4/patches
parent	b59f896089edf83ce4cd1951001b6cc889bdd287 (diff)