[LV-kern-commit] CVS: kernel-2.4/arch/vax/kernel cpu_ka55.c,1.7,1.8 cpu_ka46.c,1.13,1.14

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

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

Modified Files:
	cpu_ka55.c cpu_ka46.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: cpu_ka55.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka55.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cpu_ka55.c	26 Oct 2002 10:51:44 -0000	1.7
+++ cpu_ka55.c	2 Dec 2002 02:55:12 -0000	1.8
@@ -55,6 +55,7 @@
 		ka55_cpu_type_str,
 	        generic_clock_init,
 	        NULL,
+		MV_CPU_KA55
 	},
 	0	/* System ID Extension from ROM */
 };

Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cpu_ka46.c	26 Oct 2002 10:51:44 -0000	1.13
+++ cpu_ka46.c	2 Dec 2002 02:55:12 -0000	1.14
@@ -57,7 +57,8 @@
 		ka46_init_devices,          /* init_devices */
 		ka46_cpu_type_str,
                 ka4x_clock_init,   /* dallas rtc init */
-                NULL                  /* clock base */
+                NULL,                  /* clock base */
+		MV_CPU_KA46
 	},
 	0	/* System ID Extension from ROM */
 };