From f9db2ded6350444033ee3f5164b919348f9d1217 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Sat, 19 Nov 2011 12:19:00 +0100
Subject: [PATCH] --- yaml --- r: 282311 b: refs/heads/master c:
 1f59169e191c62e66dda86ac2bc953c915c8dddf h: refs/heads/master i:   282309:
 41b9e93beb89f5a20bb440b8d2f1f077b964b16f   282307:
 ea67029b57a7de4430e7359c6e7f594cdcaf6f6d   282303:
 f17bf0163188ea3b0293129020cd6f7a873141fb v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/hid/hid-debug.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 26c3a105f34e..51cdfc275c96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4b583d4e9a5ff28c4a150bb25a4fff5cd4dfbbd
+refs/heads/master: 1f59169e191c62e66dda86ac2bc953c915c8dddf
diff --git a/trunk/drivers/hid/hid-debug.c b/trunk/drivers/hid/hid-debug.c
index 9a243ca96e6d..940af3c20b5a 100644
--- a/trunk/drivers/hid/hid-debug.c
+++ b/trunk/drivers/hid/hid-debug.c
@@ -113,6 +113,14 @@ static const struct hid_usage_entry hid_usage_table[] = {
       {0, 0xbd, "FlareRelease"},
       {0, 0xbe, "LandingGear"},
       {0, 0xbf, "ToeBrake"},
+  {  6, 0, "GenericDeviceControls" },
+      {0, 0x20, "BatteryStrength" },
+      {0, 0x21, "WirelessChannel" },
+      {0, 0x22, "WirelessID" },
+      {0, 0x23, "DiscoverWirelessControl" },
+      {0, 0x24, "SecurityCodeCharacterEntered" },
+      {0, 0x25, "SecurityCodeCharactedErased" },
+      {0, 0x26, "SecurityCodeCleared" },
   {  7, 0, "Keyboard" },
   {  8, 0, "LED" },
       {0, 0x01, "NumLock"},