diff -urpN --exclude-from=/home/davej/.exclude bk-linus/include/linux/serio.h linux-2.5/include/linux/serio.h
--- bk-linus/include/linux/serio.h	2002-11-21 02:24:06.000000000 +0000
+++ linux-2.5/include/linux/serio.h	2002-11-21 18:04:53.000000000 +0000
@@ -22,7 +22,6 @@ struct serio {
 	void *driver;
 	char *name;
 	char *phys;
-	int number;
 
 	unsigned short idbus;
 	unsigned short idvendor;
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/ip2.c linux-2.5/drivers/char/ip2.c
--- bk-linus/drivers/char/ip2.c	2002-11-21 02:13:53.000000000 +0000
+++ linux-2.5/drivers/char/ip2.c	2002-11-21 17:57:40.000000000 +0000
@@ -33,10 +33,11 @@ ip2_loadmain(int *, int  *, unsigned cha
 */
 static int io[IP2_MAX_BOARDS]= { 0, 0, 0, 0 };
 static int irq[IP2_MAX_BOARDS] = { -1, -1, -1, -1 }; 
-static int poll_only = 0;
 
 #ifdef MODULE
 
+static int poll_only = 0;
+
 #	if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
 		MODULE_AUTHOR("Doug McNash");
 		MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");