[LV-kern-commit] CVS: kernel-2.4/include/asm-arm/arch-tbox io.h,1.1.1.2,1.2 keyboard.h,1.1.1.1,1.2 memory.h,1.1.1.1,1.2 time.h,1.1.1.1,1.2

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

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-tbox
In directory usw-pr-cvs1:/tmp/cvs-serv9454/asm-arm/arch-tbox

Modified Files:
	io.h keyboard.h memory.h time.h 
Log Message:
Synch to 2.4.15 commit 1


Index: io.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-tbox/io.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- io.h	25 Feb 2001 23:14:53 -0000	1.1.1.2
+++ io.h	9 Apr 2002 12:33:09 -0000	1.2
@@ -15,7 +15,7 @@
 /*
  * Generic virtual read/write
  */
-extern __inline__ unsigned int __arch_getw(unsigned long a)
+static inline unsigned int __arch_getw(unsigned long a)
 {
 	unsigned int value;
 	__asm__ __volatile__("ldr%?h	%0, [%1, #0]	@ getw"
@@ -24,7 +24,7 @@
 	return value;
 }
 
-extern __inline__ void __arch_putw(unsigned int value, unsigned long a)
+static inline void __arch_putw(unsigned int value, unsigned long a)
 {
 	__asm__ __volatile__("str%?h	%0, [%1, #0]	@ putw"
 		: : "r" (value), "r" (a));

Index: keyboard.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-tbox/keyboard.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- keyboard.h	14 Jan 2001 16:59:01 -0000	1.1.1.1
+++ keyboard.h	9 Apr 2002 12:33:09 -0000	1.2
@@ -3,27 +3,12 @@
  *
  * Driver definitions for Tbox dummy keyboard.
  *
- * Copyright (C) 1998 Russell King
+ * Copyright (C) 1998-2001 Russell King
  * Copyright (C) 1998 Philip Blundell
  */
 
 #define NR_SCANCODES 128
 
-#define kbd_setkeycode(sc,kc)		(-EINVAL)
-#define kbd_getkeycode(sc)		(-EINVAL)
-
-/* Prototype: int kbd_pretranslate(scancode, raw_mode)
- * Returns  : 0 to ignore scancode
- */
-#define kbd_pretranslate(sc,rm)	(1)
-
-/* Prototype: int kbd_translate(scancode, *keycode, *up_flag, raw_mode)
- * Returns  : 0 to ignore scancode, *keycode set to keycode, *up_flag
- *            set to 0200 if scancode indicates release
- */
-#define kbd_translate(sc, kcp, rm) 0
-#define kbd_unexpected_up(kc)		(0200)
-#define kbd_leds(leds)			do { } while (0)
-#define kbd_init_hw()			do { } while (0)
-#define kbd_disable_irq()		do { } while (0)
-#define kbd_enable_irq()		do { } while (0)
+#define kbd_init_hw()		do { } while (0)
+#define kbd_disable_irq()	do { } while (0)
+#define kbd_enable_irq()	do { } while (0)

Index: memory.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-tbox/memory.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- memory.h	14 Jan 2001 16:59:01 -0000	1.1.1.1
+++ memory.h	9 Apr 2002 12:33:09 -0000	1.2
@@ -41,4 +41,6 @@
 #define __bus_to_virt__is_a_macro
 #define __bus_to_virt(x)	__phys_to_virt(x)
 
+#define PHYS_TO_NID(addr)	(0)
+
 #endif

Index: time.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-tbox/time.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- time.h	14 Jan 2001 16:59:01 -0000	1.1.1.1
+++ time.h	9 Apr 2002 12:33:09 -0000	1.2
@@ -8,6 +8,13 @@
  * our soft copy.
  */
 
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
 #include <asm/io.h>
 #include <asm/hardware.h>
 
@@ -22,7 +29,7 @@
 	do_timer(regs);
 }
 
-extern __inline__ void setup_timer (void)
+static inline void setup_timer (void)
 {
 	/*
 	 * Default the date to 1 Jan 1970 0:0:0