From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Mar 2010 18:38:09 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=8724fdb53d27d7b59b60c8a399cc67f9abfabb33;p=linux-edison.git

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (62 commits)
  Input: atkbd - release previously reserved keycodes 248 - 254
  Input: add KEY_WPS_BUTTON definition
  Input: ads7846 - add regulator support
  Input: winbond-cir - fix suspend/resume
  Input: gamecon - use pr_err() and friends
  Input: gamecon - constify some of the setup structures
  Input: gamecon - simplify pad type handling
  Input: gamecon - simplify coordinate calculation for PSX
  Input: gamecon - fix some formatting issues
  Input: gamecon - add rumble support for N64 pads
  Input: wacom - add device type to device name string
  Input: s3c24xx_ts - report touch only when stylus is down
  Input: s3c24xx_ts - re-enable IRQ on resume
  Input: wacom - constify product features data
  Input: wacom - use per-device instance of wacom_features
  Input: sh_keysc - enable building on SH-Mobile ARM
  Input: wacom - get features from driver info
  Input: rotary-encoder - set gpio direction for each requested gpio
  Input: sh_keysc - update the driver with mode 6
  Input: sh_keysc - switch to using bitmaps
  ...
---

8724fdb53d27d7b59b60c8a399cc67f9abfabb33
diff --cc include/linux/input.h
index f44ee911440,889a4801f7b..dc24effb6d0
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@@ -597,49 -597,8 +597,50 @@@ struct input_absinfo 
  #define KEY_NUMERIC_POUND	0x20b
  
  #define KEY_CAMERA_FOCUS	0x210
+ #define KEY_WPS_BUTTON		0x211	/* WiFi Protected Setup key */
  
 +#define BTN_TRIGGER_HAPPY		0x2c0
 +#define BTN_TRIGGER_HAPPY1		0x2c0
 +#define BTN_TRIGGER_HAPPY2		0x2c1
 +#define BTN_TRIGGER_HAPPY3		0x2c2
 +#define BTN_TRIGGER_HAPPY4		0x2c3
 +#define BTN_TRIGGER_HAPPY5		0x2c4
 +#define BTN_TRIGGER_HAPPY6		0x2c5
 +#define BTN_TRIGGER_HAPPY7		0x2c6
 +#define BTN_TRIGGER_HAPPY8		0x2c7
 +#define BTN_TRIGGER_HAPPY9		0x2c8
 +#define BTN_TRIGGER_HAPPY10		0x2c9
 +#define BTN_TRIGGER_HAPPY11		0x2ca
 +#define BTN_TRIGGER_HAPPY12		0x2cb
 +#define BTN_TRIGGER_HAPPY13		0x2cc
 +#define BTN_TRIGGER_HAPPY14		0x2cd
 +#define BTN_TRIGGER_HAPPY15		0x2ce
 +#define BTN_TRIGGER_HAPPY16		0x2cf
 +#define BTN_TRIGGER_HAPPY17		0x2d0
 +#define BTN_TRIGGER_HAPPY18		0x2d1
 +#define BTN_TRIGGER_HAPPY19		0x2d2
 +#define BTN_TRIGGER_HAPPY20		0x2d3
 +#define BTN_TRIGGER_HAPPY21		0x2d4
 +#define BTN_TRIGGER_HAPPY22		0x2d5
 +#define BTN_TRIGGER_HAPPY23		0x2d6
 +#define BTN_TRIGGER_HAPPY24		0x2d7
 +#define BTN_TRIGGER_HAPPY25		0x2d8
 +#define BTN_TRIGGER_HAPPY26		0x2d9
 +#define BTN_TRIGGER_HAPPY27		0x2da
 +#define BTN_TRIGGER_HAPPY28		0x2db
 +#define BTN_TRIGGER_HAPPY29		0x2dc
 +#define BTN_TRIGGER_HAPPY30		0x2dd
 +#define BTN_TRIGGER_HAPPY31		0x2de
 +#define BTN_TRIGGER_HAPPY32		0x2df
 +#define BTN_TRIGGER_HAPPY33		0x2e0
 +#define BTN_TRIGGER_HAPPY34		0x2e1
 +#define BTN_TRIGGER_HAPPY35		0x2e2
 +#define BTN_TRIGGER_HAPPY36		0x2e3
 +#define BTN_TRIGGER_HAPPY37		0x2e4
 +#define BTN_TRIGGER_HAPPY38		0x2e5
 +#define BTN_TRIGGER_HAPPY39		0x2e6
 +#define BTN_TRIGGER_HAPPY40		0x2e7
 +
  /* We avoid low common keys in module aliases so they don't get huge. */
  #define KEY_MIN_INTERESTING	KEY_MUTE
  #define KEY_MAX			0x2ff