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 9f1b6290f87d03af0eaaca48c1148fd034a7cdc4..97f20662fdcdefffaae21e2d7a4f2fafc8e78c96 100644 (file)
--- 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 46d90a101c5e4254a9898d2d82bf42c459576dc8..052de9570e07b1c71201e7baad631ae9c1fb6733 100644 (file)
--- 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