From: Tony Lindgren <tony@atomide.com>
Date: Tue, 11 Oct 2005 16:21:34 +0000 (+0300)
Subject: Merge with /home/tmlind/src/kernel/linux-2.6
X-Git-Tag: v2.6.15-omap2~156
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=455773346a708432c33805c4dafedea1679f68dd;p=linux-2.6-omap-h63xx.git

Merge with /home/tmlind/src/kernel/linux-2.6
---

455773346a708432c33805c4dafedea1679f68dd
diff --cc drivers/input/keyboard/Makefile
index a2f928a763f,9ce0b87f2fa..df33964341f
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@@ -14,7 -14,7 +14,8 @@@ obj-$(CONFIG_KEYBOARD_LOCOMO)		+= locom
  obj-$(CONFIG_KEYBOARD_NEWTON)		+= newtonkbd.o
  obj-$(CONFIG_KEYBOARD_98KBD)		+= 98kbd.o
  obj-$(CONFIG_KEYBOARD_CORGI)		+= corgikbd.o
+ obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o
  obj-$(CONFIG_KEYBOARD_HIL)		+= hil_kbd.o
  obj-$(CONFIG_KEYBOARD_HIL_OLD)		+= hilkbd.o
 -
 +obj-$(CONFIG_KEYBOARD_OMAP)             += omap-keypad.o
 +obj-$(CONFIG_OMAP_PS2)			+= innovator_ps2.o
diff --cc include/asm-arm/arch-omap/memory.h
index af8bc25ddb2,ef32d61eec7..ae985834578
--- a/include/asm-arm/arch-omap/memory.h
+++ b/include/asm-arm/arch-omap/memory.h
@@@ -84,8 -84,7 +84,7 @@@
  					virt_to_lbus(addr) : \
  					__virt_to_bus(addr);})
  
 -#endif	/* CONFIG_ARCH_OMAP1510 */
 +#endif	/* CONFIG_ARCH_OMAP15XX */
  
- #define PHYS_TO_NID(addr) (0)
  #endif