switch (MAJOR_OP(regs->iir))
--- linux-2.6.0-test6/arch/parisc/lib/checksum.c 2003-06-14 12:18:24.000000000 -0700
+++ 25/arch/parisc/lib/checksum.c 2003-10-05 00:33:23.000000000 -0700
-@@ -16,8 +16,10 @@
- *
- * $Id: 2.6.0-test6-mm4.patch,v 1.5 2004/02/23 23:37:02 phil Exp $
+@@ -18,6 +18,8 @@
*/
-#include <net/checksum.h>
+#include <linux/module.h>
#include <linux/config.h>
--- linux-2.6.0-test6/drivers/char/ftape/compressor/zftape-compress.c 2003-06-14 12:18:32.000000000 -0700
+++ 25/drivers/char/ftape/compressor/zftape-compress.c 2003-10-05 00:33:24.000000000 -0700
-@@ -31,6 +31,7 @@
- char zftc_rev[] = "$Revision: 1.5 $";
- char zftc_dat[] = "$Date: 2004/02/23 23:37:02 $";
+@@ -33,4 +33,5 @@
+#include <linux/version.h>
#include <linux/errno.h>
--- linux-2.6.0-test6/drivers/isdn/hardware/eicon/divamnt.c 2003-09-27 18:57:44.000000000 -0700
+++ 25/drivers/isdn/hardware/eicon/divamnt.c 2003-10-05 00:33:24.000000000 -0700
-@@ -1,4 +1,4 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.5 2004/02/23 23:37:02 phil Exp $
-+/* Id: 2.6.0-test6-mm4.patch,v 1.3.2.1 2004/02/14 07:21:32 nic Exp $
- *
- * Driver for Eicon DIVA Server ISDN cards.
- * Maint module
-@@ -24,10 +24,9 @@
+@@ -24,6 +24,5 @@
#include "platform.h"
#include "di_defs.h"
#include "divasync.h"
-#include "di_defs.h"
#include "debug_if.h"
--static char *main_revision = "$Revision: 1.5 $";
-+static char *main_revision = "$Revision: 1.5 $";
-
- static int major;
-
--- linux-2.6.0-test6/drivers/isdn/hardware/eicon/divasmain.c 2003-09-27 18:57:44.000000000 -0700
+++ 25/drivers/isdn/hardware/eicon/divasmain.c 2003-10-05 00:33:24.000000000 -0700
-@@ -1,4 +1,4 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.5 2004/02/23 23:37:02 phil Exp $
-+/* Id: 2.6.0-test6-mm4.patch,v 1.3.2.1 2004/02/14 07:21:32 nic Exp $
- *
- * Low level driver for Eicon DIVA Server ISDN cards.
- *
@@ -9,13 +9,11 @@
* of the GNU General Public License, incorporated herein by reference.
*/
#include <linux/devfs_fs_kernel.h>
#include <asm/uaccess.h>
#include <asm/io.h>
-@@ -43,7 +41,7 @@
- #include "diva_dma.h"
- #include "diva_pci.h"
-
--static char *main_revision = "$Revision: 1.5 $";
-+static char *main_revision = "$Revision: 1.5 $";
-
- static int major;
-
---- linux-2.6.0-test6/drivers/isdn/hardware/eicon/dqueue.c 2003-06-14 12:18:22.000000000 -0700
-+++ 25/drivers/isdn/hardware/eicon/dqueue.c 2003-10-05 00:33:24.000000000 -0700
-@@ -1,10 +1,10 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.5 2004/02/23 23:37:02 phil Exp $
-+/* Id: 2.6.0-test6-mm4.patch,v 1.3.2.1 2004/02/14 07:21:32 nic Exp $
- *
- * Driver for Eicon DIVA Server ISDN cards.
- * User Mode IDI Interface
- *
-- * Copyright 2000,2001 by Armin Schindler (mac@melware.de)
-- * Copyright 2000,2001 Cytronics & Melware (info@melware.de)
-+ * Copyright 2000-2003 by Armin Schindler (mac@melware.de)
-+ * Copyright 2000-2003 Cytronics & Melware (info@melware.de)
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
--- linux-2.6.0-test6/drivers/isdn/hardware/eicon/mntfunc.c 2003-09-27 18:57:44.000000000 -0700
+++ 25/drivers/isdn/hardware/eicon/mntfunc.c 2003-10-05 00:33:24.000000000 -0700
-@@ -1,4 +1,4 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.5 2004/02/23 23:37:02 phil Exp $
-+/* Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
- *
- * Driver for Eicon DIVA Server ISDN cards.
- * Maint module
@@ -14,7 +14,6 @@
#include "platform.h"
#include "di_defs.h"
#include "debug_if.h"
extern char *DRIVERRELEASE_MNT;
---- linux-2.6.0-test6/drivers/isdn/hardware/eicon/os_capi.h 2003-06-14 12:18:25.000000000 -0700
-+++ 25/drivers/isdn/hardware/eicon/os_capi.h 2003-10-05 00:33:24.000000000 -0700
-@@ -1,10 +1,10 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.5 2004/02/23 23:37:02 phil Exp $
-+/* Id: 2.6.0-test6-mm4.patch,v 1.3.2.1 2004/02/14 07:21:32 nic Exp $
- *
- * ISDN interface module for Eicon active cards DIVA.
- * CAPI Interface OS include files
- *
-- * Copyright 2000-2002 by Armin Schindler (mac@melware.de)
-- * Copyright 2000-2002 Cytronics & Melware (info@melware.de)
-+ * Copyright 2000-2003 by Armin Schindler (mac@melware.de)
-+ * Copyright 2000-2003 Cytronics & Melware (info@melware.de)
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
--- linux-2.6.0-test6/drivers/isdn/hardware/eicon/platform.h 2003-09-27 18:57:44.000000000 -0700
+++ 25/drivers/isdn/hardware/eicon/platform.h 2003-10-05 00:33:24.000000000 -0700
-@@ -1,4 +1,4 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.5 2004/02/23 23:37:02 phil Exp $
-+/* Id: 2.6.0-test6-mm4.patch,v 1.3.2.1 2004/02/14 07:21:32 nic Exp $
- *
- * platform.h
- *
@@ -19,7 +19,6 @@
#endif
/* Motion JPEG chip registers */
--- linux-2.6.0-test6/drivers/media/video/planb.c 2003-09-08 13:58:57.000000000 -0700
+++ 25/drivers/media/video/planb.c 2003-10-05 00:33:24.000000000 -0700
-@@ -27,7 +27,6 @@
-
- /* $Id: 2.6.0-test6-mm4.patch,v 1.5 2004/02/23 23:37:02 phil Exp $ */
+@@ -29,5 +29,4 @@
-#include <linux/version.h>
#include <linux/init.h>
static struct mtd_info *check_cmd_set(struct map_info *, int);
--- linux-2.6.0-test6/drivers/mtd/chips/map_rom.c 2003-06-14 12:18:24.000000000 -0700
+++ 25/drivers/mtd/chips/map_rom.c 2003-10-05 00:33:24.000000000 -0700
-@@ -4,7 +4,6 @@
- * $Id: 2.6.0-test6-mm4.patch,v 1.5 2004/02/23 23:37:02 phil Exp $
+@@ -5,6 +5,7 @@
*/
-#include <linux/version.h>
add_timer((struct timer_list *)&board->modemline_timer);
--- linux-2.6.0-test6/drivers/net/wan/dscc4.c 2003-09-27 18:57:45.000000000 -0700
+++ 25/drivers/net/wan/dscc4.c 2003-10-05 00:36:13.000000000 -0700
-@@ -107,7 +107,7 @@
- #include <linux/hdlc.h>
-
- /* Version */
--static const char version[] = "$Id: 2.6.0-test6-mm4.patch,v 1.5 2004/02/23 23:37:02 phil Exp $ for Linux\n";
-+static const char version[] = "Id: 2.6.0-test6-mm4.patch,v 1.3.2.1 2004/02/14 07:21:32 nic Exp $ for Linux\n";
- static int debug;
- static int quartz;
-
@@ -592,6 +592,7 @@ static inline int dscc4_xpr_ack(struct d
return (i >= 0 ) ? i : -EAGAIN;
}