From: Tony Lindgren <tony@atomide.com>
Date: Tue, 13 Sep 2005 10:19:46 +0000 (+0300)
Subject: Merge with ../linux-2.6
X-Git-Tag: v2.6.14-rc1-omap1~3
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=1f08c73e2707e9e8aa2365910b98e3a97803087c;p=linux-2.6-omap-h63xx.git

Merge with ../linux-2.6
---

1f08c73e2707e9e8aa2365910b98e3a97803087c
diff --cc drivers/char/watchdog/Makefile
index 22aad4b3e50,bc6f5fe88c8..1e430edc303
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@@ -27,9 -27,9 +27,10 @@@ obj-$(CONFIG_21285_WATCHDOG) += wdt285.
  obj-$(CONFIG_977_WATCHDOG) += wdt977.o
  obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
  obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
 +obj-$(CONFIG_OMAP16XX_WATCHDOG) += omap1610_wdt.o
  obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
  obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
+ obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
  
  # X86 (i386 + ia64 + x86_64) Architecture
  obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
diff --cc include/linux/input.h
index 595649e995f,e8c296ff625..1de70ae4a34
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@@ -328,23 -332,17 +332,29 @@@ struct input_absinfo 
  #define KEY_BRIGHTNESSUP	225
  #define KEY_MEDIA		226
  
 -#define KEY_SWITCHVIDEOMODE	227
 -#define KEY_KBDILLUMTOGGLE	228
 -#define KEY_KBDILLUMDOWN	229
 -#define KEY_KBDILLUMUP		230
 +
 +/*Zeus: these keys are defined for OMAP730 Perseus2*/
 +#define KEY_STAR		227
 +#define KEY_SHARP		228
 +#define KEY_SOFT1		229
 +#define KEY_SOFT2		230
 +#define KEY_SEND		231
 +#define KEY_CENTER		232
 +#define KEY_HEADSETHOOK		233
 +#define KEY_0_5			234
 +#define KEY_2_5			235
 +
 +#define KEY_SWITCHVIDEOMODE	236
 +#define KEY_KBDILLUMTOGGLE	237
 +#define KEY_KBDILLUMDOWN	238
 +#define KEY_KBDILLUMUP		239
  
+ #define KEY_SEND		231
+ #define KEY_REPLY		232
+ #define KEY_FORWARDMAIL		233
+ #define KEY_SAVE		234
+ #define KEY_DOCUMENTS		235
+ 
  #define KEY_UNKNOWN		240
  
  #define BTN_MISC		0x100