The HID_CONNECT_DRIVER flag was added in Linux 3.18, while the
'hid_report_len' function was added in Linux 3.19.
Signed-off-by: Jason Gerecke <killert...@gmail.com>
---
3.17/wacom_sys.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/3.17/wacom_sys.c b/3.17/wacom_sys.c
index 9cf4a6a..a517e37 100644
--- a/3.17/wacom_sys.c
+++ b/3.17/wacom_sys.c
@@ -1340,7 +1340,7 @@ static void wacom_calculate_res(struct wacom_features
*features)
features->unitExpo);
}
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
static int wacom_hid_report_len(struct hid_report *report)
{
/* equivalent to DIV_ROUND_UP(report->size, 8) + !!(report->id > 0) */
@@ -1357,7 +1357,7 @@ static size_t wacom_compute_pktlen(struct hid_device
*hdev)
report_enum = hdev->report_enum + HID_INPUT_REPORT;
list_for_each_entry(report, &report_enum->report_list, list) {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,18,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
size_t report_size = wacom_hid_report_len(report);
#else
size_t report_size = hid_report_len(report);
@@ -1510,7 +1510,7 @@ static int wacom_probe(struct hid_device *hdev,
}
if (features->type == HID_GENERIC)
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,18,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
hdev->claimed |= 8; /* HID_CLAIMED_DRIVER */
#else
connect_mask |= HID_CONNECT_DRIVER;
--
2.3.0
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
