From: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Date: Thu, 20 Dec 2012 02:17:56 +0000 (-0800)
Subject: compat: move HID_USB_DEVICE and HID_BLUETOOTH_DEVICE
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=46faf02b9a0e7e0e020143311aa037aebde53178;p=openwrt%2Fstaging%2Fblogic.git

compat: move HID_USB_DEVICE and HID_BLUETOOTH_DEVICE

These were actually introduced in 2.6.28.h and as such
we were getting a lot of redefinition warnings which
can cause delays in compilation. Lets clear this up ;)

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---

diff --git a/include/linux/compat-2.6.28.h b/include/linux/compat-2.6.28.h
index 9f1b6290f87d..97f20662fdcd 100644
--- a/include/linux/compat-2.6.28.h
+++ b/include/linux/compat-2.6.28.h
@@ -12,9 +12,16 @@
 #include <linux/types.h>
 #include <linux/cpumask.h>
 #include <linux/mod_devicetable.h>
+#include <linux/input.h>
 
 #define HID_ANY_ID                             (~0)
 
+#define HID_USB_DEVICE(ven, prod)                              \
+	.bus = BUS_USB, .vendor = (ven), .product = (prod)
+#define HID_BLUETOOTH_DEVICE(ven, prod)                                        \
+	.bus = BUS_BLUETOOTH, .vendor = (ven), .product = (prod)
+
+
 struct hid_device_id {
 	__u16 bus;
 	__u32 vendor;
diff --git a/include/linux/compat-3.8.h b/include/linux/compat-3.8.h
index 46d90a101c5e..052de9570e07 100644
--- a/include/linux/compat-3.8.h
+++ b/include/linux/compat-3.8.h
@@ -7,11 +7,6 @@
 
 #include <linux/hid.h>
 
-#define HID_USB_DEVICE(ven, prod)                              \
-	.bus = BUS_USB, .vendor = (ven), .product = (prod)
-#define HID_BLUETOOTH_DEVICE(ven, prod)                                        \
-	.bus = BUS_BLUETOOTH, .vendor = (ven), .product = (prod)
-
 #define HID_BUS_ANY                            0xffff
 #define HID_GROUP_ANY                          0x0000