linux-vax-kern-commit

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

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

Modified Files:
	cpu_ka410.c cpu_ka42.c cpu_ka43.c cpu_ka46.c cpu_ka55.c 
Log Message:
DA: make compile with CONFIG_DZ switched off


Index: cpu_ka410.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka410.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cpu_ka410.c	25 Apr 2002 08:46:20 -0000	1.3
+++ cpu_ka410.c	26 Oct 2002 10:51:44 -0000	1.4
@@ -60,9 +60,11 @@
 
 void ka410_post_vm_init(void)
 {
+#ifdef CONFIG_DZ
    init_dz11_console(0x200A000, 3);
 
    dz_serial_console_init(0,0);
+#endif
 }
 
 const char *ka410_cpu_type_str(void)

Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cpu_ka42.c	25 Apr 2002 08:46:20 -0000	1.7
+++ cpu_ka42.c	26 Oct 2002 10:51:44 -0000	1.8
@@ -70,10 +70,11 @@
 #define KA42_CADR_ISE 0x20
 #define KA42_CADR_DSE 0x10
    __mtpr(KA42_CADR_S2E|KA42_CADR_S1E|KA42_CADR_ISE|KA42_CADR_DSE, PR_CADR);
-
+#ifdef CONFIG_DZ
    init_dz11_console(0x200A0000, 3);
 
    dz_serial_console_init(0, 0);
+#endif
 }
 
 void ka42_init_devices(void)

Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cpu_ka43.c	25 Apr 2002 08:46:20 -0000	1.8
+++ cpu_ka43.c	26 Oct 2002 10:51:44 -0000	1.9
@@ -94,9 +94,11 @@
 /* dont call ka43_cache_reset before this function (unlikely) */
 void ka43_post_vm_init(void)
 {
+#ifdef CONFIG_DZ
    init_dz11_console(0x200A0000, 3);
 
    dz_serial_console_init(0, 0);
+#endif
 
    cpu_regs = ioremap(KA43_CPU_BASE, KA43_CPU_SIZE);
    ka43_creg_addr = ioremap(KA43_CH2_CREG, 1);

Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cpu_ka46.c	18 May 2002 18:12:35 -0000	1.12
+++ cpu_ka46.c	26 Oct 2002 10:51:44 -0000	1.13
@@ -83,8 +83,10 @@
 
 void ka46_post_vm_init(void)
 {
+#ifdef CONFIG_DZ
    init_dz11_console(0x200A0000, 3);
    dz_serial_console_init(0, 0);
+#endif
 }
 
 const char *ka46_cpu_type_str(void)

Index: cpu_ka55.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka55.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpu_ka55.c	25 Apr 2002 08:46:20 -0000	1.6
+++ cpu_ka55.c	26 Oct 2002 10:51:44 -0000	1.7
@@ -91,9 +91,11 @@
 
 void ka55_post_vm_init(void)
 {
+#ifdef CONFIG_DZ
    init_dz11_console(0x25000000, 3);
 
    dz_serial_console_init(0, 0);
+#endif
 }
 
 const char *ka55_cpu_type_str(void)