From d9825f7a453555b587ed492434694ed5582b9149 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 26 Feb 2010 00:16:05 -0800
Subject: [PATCH] --- yaml --- r: 183143 b: refs/heads/master c:
 492d4f25416528ffb900e6edf0fd70eafd098cfc h: refs/heads/master i:   183141:
 2c2613052dc9bcbc58f40541779eb1903b8970eb   183139:
 f5d25b17d8fe4aab3f94d989894858b4fab0b57a   183135:
 81c007c7fb23dbbc05918705a2376721a2d79804 v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/input.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4bd685d528ea..353b7bbfa705 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91143379b01b2020d8878d627ebe9dfb9d6eb4c8
+refs/heads/master: 492d4f25416528ffb900e6edf0fd70eafd098cfc
diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h
index 8dc5d724c703..828c3feb7213 100644
--- a/trunk/include/linux/input.h
+++ b/trunk/include/linux/input.h
@@ -596,6 +596,7 @@ struct input_absinfo {
 #define KEY_NUMERIC_POUND	0x20b
 
 #define KEY_CAMERA_FOCUS	0x210
+#define KEY_WPS_BUTTON		0x211	/* WiFi Protected Setup key */
 
 /* We avoid low common keys in module aliases so they don't get huge. */
 #define KEY_MIN_INTERESTING	KEY_MUTE