[LV-kern-commit] CVS: kernel-2.4/drivers/char dz.c,1.12,1.13

[Richard B. <rb...@us...>]

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

Modified Files:
	dz.c 
Log Message:
Added cpu_type to machine vector.
Use this to remove the is_ka55 and is_ka46 calls and replace with a more
generic cpu_type check.

Changed the drivers for the dz, lance, sgec and vax_esp devices.

Also merged the ka55.h file into the vsa.h file and added the vsbus struct
into the same file.

Actual register and hex addresses are still hardcoded for the moment, but
at least this is a bit cleaner than before...


Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dz.c	11 Apr 2002 13:30:51 -0000	1.12
+++ dz.c	2 Dec 2002 02:55:10 -0000	1.13
@@ -62,6 +62,7 @@
 #include <asm/irq.h>
 
 #ifdef CONFIG_VAX
+#include <asm/mv.h>
 #include <asm/vsa.h>
 #include <asm/dz11.h>
 volatile struct dz11_regs *dz11_addr;
@@ -1546,7 +1547,7 @@
     irq=autoirq_report(0);
   }
 #else    
-if (is_ka46()){
+if (mv->cpu_type==MV_CPU_KA46){
   dz_vsbus_tx_int=5;
   dz_vsbus_rx_int=4;
   irq=149;