[LV-kern-commit] CVS: kernel-2.4/arch/m68k/apollo config.c,1.1.1.1,1.2 dn_ints.c,1.1.1.1,1.2

[Andy P. <at...@us...>]

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

Modified Files:
	config.c dn_ints.c 
Log Message:
synch 2.4.15 commit 37


Index: config.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/apollo/config.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- config.c	14 Jan 2001 19:41:29 -0000	1.1.1.1
+++ config.c	10 Apr 2002 14:34:33 -0000	1.2
@@ -2,7 +2,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/kd.h>
 #include <linux/tty.h>
 #include <linux/console.h>
 
@@ -12,6 +11,7 @@
 #include <asm/pgtable.h>
 #include <asm/apollohw.h>
 #include <asm/irq.h>
+#include <asm/rtc.h>
 #include <asm/machdep.h>
 
 u_long sio01_physaddr;

Index: dn_ints.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/apollo/dn_ints.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dn_ints.c	14 Jan 2001 19:41:29 -0000	1.1.1.1
+++ dn_ints.c	10 Apr 2002 14:34:33 -0000	1.2
@@ -24,7 +24,7 @@
     dn_irqs[irq-160].handler(irq,dn_irqs[irq-160].dev_id,fp);
   }
   else {
-    printk("spurious irq %d occured\n",irq);
+    printk("spurious irq %d occurred\n",irq);
   }
 
   *(volatile unsigned char *)(pica)=0x20;