summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2014-04-02 23:53:36 +0000
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2014-04-08 18:23:54 -0700
commit9624292feed8df39c84830399af9ba3370485e7c (patch)
treee62dd93c013291d4eb3b3d5a46246be6b28dadd8
parentf164ea0ffac00bedfe0eedc1757d644c397c6ab2 (diff)
backports: remove bluetooth HIDP backport
This is only needed for code coming in from v3.15. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r--patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch b/patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch
deleted file mode 100644
index 19b3b854..00000000
--- a/patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/net/bluetooth/hidp/core.c
-+++ b/net/bluetooth/hidp/core.c
-@@ -223,6 +223,7 @@ static void hidp_input_report(struct hid
- input_sync(dev);
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
- static int hidp_get_raw_report(struct hid_device *hid,
- unsigned char report_number,
- unsigned char *data, size_t count,
-@@ -307,6 +308,7 @@ err:
- mutex_unlock(&session->report_mutex);
- return ret;
- }
-+#endif
-
- static int hidp_set_raw_report(struct hid_device *hid, unsigned char reportnum,
- unsigned char *data, size_t count,
-@@ -394,6 +396,7 @@ static int hidp_output_raw_report(struct
- return hidp_set_raw_report(hid, data[0], data, count, report_type);
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
- static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum,
- __u8 *buf, size_t len, unsigned char rtype,
- int reqtype)
-@@ -407,6 +410,7 @@ static int hidp_raw_request(struct hid_d
- return -EIO;
- }
- }
-+#endif
-
- static void hidp_idle_timeout(unsigned long arg)
- {
-@@ -736,8 +740,10 @@ static struct hid_ll_driver hidp_hid_dri
- .stop = hidp_stop,
- .open = hidp_open,
- .close = hidp_close,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
- .raw_request = hidp_raw_request,
- .output_report = hidp_output_report,
-+#endif
- };
-
- /* This function sets up the hid device. It does not add it