[LV-kern-commit] kernel-2.4/drivers/char dz.c,1.15,1.16

[<ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv27852

Modified Files:
	dz.c 
Log Message:
fix up merges for dz.c


Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dz.c	27 Sep 2003 13:11:56 -0000	1.15
+++ dz.c	28 Sep 2003 04:46:21 -0000	1.16
@@ -21,7 +21,7 @@
  * [07-SEP-99] Bugfixes 
  */
 
-#define DEBUG_DZ 1
+/*#define DEBUG_DZ 1*/
 
 #include <linux/config.h>
 #include <linux/version.h>
@@ -46,6 +46,7 @@
 #include <linux/fs.h>
 
 #ifdef CONFIG_VAX
+#include <linux/ioport.h>
 #include <asm/mv.h>
 #include <asm/vsa.h>
 #include <asm/dz11.h>
@@ -53,6 +54,7 @@
 #define SERIAL_TX 0xB1 /* FIXME: this is wrong */
 #define SERIAL SERIAL_RX
 volatile struct dz11_regs *dz11_addr;
+#define iob() do { } while (0)
 #else
 #include <asm/bootinfo.h>
 #include <asm/dec/interrupts.h>
@@ -91,6 +93,8 @@
 		prom_printf("%c", *s++);
 	}
 }
+#else
+#define debug_console(s, count) do { } while (0)
 #endif
 
 /*
@@ -1421,6 +1425,7 @@
 
 #ifdef CONFIG_VAX
 		info->port = (unsigned long) dz11_addr;
+#else
 		if (mips_machtype == MACH_DS23100 ||
 		    mips_machtype == MACH_DS5100)
 			info->port = (unsigned long) KN01_DZ11_BASE;