--- linux-2.5.2-pre8/drivers/char/rio/linux_compat.h	Wed Jul  4 14:41:33 2001
+++ linux/drivers/char/rio/linux_compat.h	Fri Jan  4 21:25:30 2002
@@ -60,9 +60,6 @@
 
 #define getpid()    (current->pid)
 
-#define major(dev) MAJOR(dev)
-#define minor(dev) MINOR(dev)
-
 #define QSIZE SERIAL_XMIT_SIZE
 
 #define pseterr(errno) return (- errno)
--- linux-2.5.2-pre8/drivers/char/rio/rio.h	Wed Aug 15 01:22:15 2001
+++ linux/drivers/char/rio/rio.h	Fri Jan  4 21:25:30 2002
@@ -205,10 +205,10 @@
 #define	RIO_MODEMOFFSET		0x200	/* doesn't mean anything */
 #define	RIO_MODEM_MASK		0x1FF
 #define	RIO_MODEM_BIT		0x200
-#define	RIO_UNMODEM(DEV)	(minor(DEV) & RIO_MODEM_MASK)
-#define	RIO_ISMODEM(DEV)	(minor(DEV) & RIO_MODEM_BIT)
-#define RIO_PORT(DEV,FIRST_MAJ)	( (major(DEV) - FIRST_MAJ) * PORTS_PER_HOST) \
-					+ minor(DEV)
+#define	RIO_UNMODEM(DEV)	(MINOR(DEV) & RIO_MODEM_MASK)
+#define	RIO_ISMODEM(DEV)	(MINOR(DEV) & RIO_MODEM_BIT)
+#define RIO_PORT(DEV,FIRST_MAJ)	( (MAJOR(DEV) - FIRST_MAJ) * PORTS_PER_HOST) \
+					+ MINOR(DEV)
 
 #define	splrio	spltty
 
--- linux-2.5.2-pre8/drivers/char/rio/rio_linux.h	Wed Jul  4 14:41:33 2001
+++ linux/drivers/char/rio/rio_linux.h	Fri Jan  4 21:25:30 2002
@@ -178,10 +178,9 @@
 
 #ifdef DEBUG
 #define rio_dprintk(f, str...) do { if (rio_debug & f) printk (str);} while (0)
-#define func_enter() rio_dprintk (RIO_DEBUG_FLOW, "rio: enter " __FUNCTION__ "\n")
-#define func_exit()  rio_dprintk (RIO_DEBUG_FLOW, "rio: exit  " __FUNCTION__ "\n")
-#define func_enter2() rio_dprintk (RIO_DEBUG_FLOW, "rio: enter " __FUNCTION__ \
-                                   "(port %d)\n", port->line)
+#define func_enter() rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s\n", __FUNCTION__)
+#define func_exit()  rio_dprintk (RIO_DEBUG_FLOW, "rio: exit  %s\n", __FUNCTION__)
+#define func_enter2() rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s (port %d)\n",__FUNCTION__, port->line)
 #else
 #define rio_dprintk(f, str...) /* nothing */
 #define func_enter()