[LV-kern-commit] CVS: kernel-2.4/include/asm-arm/arch-nexuspci 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-nexuspci
In directory usw-pr-cvs1:/tmp/cvs-serv9454/asm-arm/arch-nexuspci

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-nexuspci/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
@@ -18,7 +18,7 @@
 #define __mem_isa(a)		(PCIMEM_BASE + (unsigned long)(a))
 #else
 
-extern __inline__ unsigned long ___mem_pci(unsigned long a)
+static inline unsigned long ___mem_pci(unsigned long a)
 {
 	/* PCI addresses must have been ioremapped */
 	if (a <= 0xc0000000 || a >= 0xe0000000)
@@ -26,7 +26,7 @@
 	return a;
 }
 
-extern __inline__ unsigned long ___mem_isa(unsigned long a)
+static inline unsigned long ___mem_isa(unsigned long a)
 {
 	if (a >= 16*1048576)
 		BUG();

Index: keyboard.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-nexuspci/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:58:31 -0000	1.1.1.1
+++ keyboard.h	9 Apr 2002 12:33:09 -0000	1.2
@@ -3,27 +3,12 @@
  *
  * Driver definitions for PCI card 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-nexuspci/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:58:30 -0000	1.1.1.1
+++ memory.h	9 Apr 2002 12:33:09 -0000	1.2
@@ -43,4 +43,6 @@
 #define __bus_to_virt__is_a_macro
 #define __bus_to_virt(x) ((unsigned long)(x) + PAGE_OFFSET - BUS_OFFSET)
 
+#define PHYS_TO_NID(addr)	(0)
+
 #endif

Index: time.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-arm/arch-nexuspci/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:58:30 -0000	1.1.1.1
+++ time.h	9 Apr 2002 12:33:09 -0000	1.2
@@ -43,7 +43,7 @@
 	do_timer(regs);	
 }
 
-extern __inline__ void setup_timer(void)
+static inline void setup_timer(void)
 {
 	int tick = 3686400 / 16 / 2 / 100;