Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.

1 files changed, 14 insertions, 13 deletions

diff --git a/drivers/usb/hid-debug.h b/drivers/usb/hid-debug.h
index 52fc94adb..8aaf4be81 100644
--- a/drivers/usb/hid-debug.h
+++ b/drivers/usb/hid-debug.h
@@ -67,19 +67,19 @@ static struct hid_usage_entry hid_usage_table[] = {
       {0, 0x45, "Vbrz"},
       {0, 0x46, "Vno"},
     {0, 0x80, "SystemControl"}, 
-      {0, 0x81, "System PowerDown"},
-      {0, 0x82, "System Sleep"},
-      {0, 0x83, "System WakeUp"},
-      {0, 0x84, "System ContextMenu"},
-      {0, 0x85, "System MainMenu"},
-      {0, 0x86, "System AppMenu"},
-      {0, 0x87, "System MenuHelp"},
-      {0, 0x88, "System MenuExit"},
-      {0, 0x89, "System MenuSelect"},
-      {0, 0x8a, "System MenuRight"},
-      {0, 0x8b, "System MenuLeft"},
-      {0, 0x8c, "System MenuUp"},
-      {0, 0x8d, "System MenuDown"},
+      {0, 0x81, "SystemPowerDown"},
+      {0, 0x82, "SystemSleep"},
+      {0, 0x83, "SystemWakeUp"},
+      {0, 0x84, "SystemContextMenu"},
+      {0, 0x85, "SystemMainMenu"},
+      {0, 0x86, "SystemAppMenu"},
+      {0, 0x87, "SystemMenuHelp"},
+      {0, 0x88, "SystemMenuExit"},
+      {0, 0x89, "SystemMenuSelect"},
+      {0, 0x8a, "SystemMenuRight"},
+      {0, 0x8b, "SystemMenuLeft"},
+      {0, 0x8c, "SystemMenuUp"},
+      {0, 0x8d, "SystemMenuDown"},
     {0, 0x90, "D-padUp"},
     {0, 0x91, "D-padDown"},
     {0, 0x92, "D-padRight"},
@@ -87,6 +87,7 @@ static struct hid_usage_entry hid_usage_table[] = {
   {  7, 0, "Keyboard" },
   {  8, 0, "LED" },
   {  9, 0, "Button" },
+  { 12, 0, "Hotkey" },
   { 13, 0, "Digitizers" },
     {0, 0x01, "Digitizer"},
     {0, 0x02, "Pen"},