Patched in Tegra support.

1 files changed, 3 insertions, 18 deletions

diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 933fff0fff1..9a243ca96e6 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -31,7 +31,6 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/sched.h>
-#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <linux/poll.h>
@@ -114,14 +113,6 @@ 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"},
@@ -911,21 +902,15 @@ static void hid_dump_input_mapping(struct hid_device *hid, struct seq_file *f)
 
 }
 
+
 static int hid_debug_rdesc_show(struct seq_file *f, void *p)
 {
         struct hid_device *hdev = f->private;
-        const __u8 *rdesc = hdev->rdesc;
-        unsigned rsize = hdev->rsize;
         int i;
 
-        if (!rdesc) {
-                rdesc = hdev->dev_rdesc;
-                rsize = hdev->dev_rsize;
-        }
-
         /* dump HID report descriptor */
-        for (i = 0; i < rsize; i++)
-                seq_printf(f, "%02x ", rdesc[i]);
+        for (i = 0; i < hdev->rsize; i++)
+                seq_printf(f, "%02x ", hdev->rdesc[i]);
         seq_printf(f, "\n\n");
 
         /* dump parsed data and input mappings */