Merge branch 'next' into for-linus

[linux-block.git] / drivers / input / mouse / elan_i2c_core.c

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 61ed3f5ca2199521d395c020811c45c3ede959dd..bef73822315d5139ab81804c209d3d90f1648d2b 100644 (file)
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -34,7 +34,6 @@
 #include <linux/completion.h>
 #include <linux/of.h>
 #include <linux/property.h>
-#include <linux/input/elan-i2c-ids.h>
 #include <linux/regulator/consumer.h>
 #include <asm/unaligned.h>
 
@@ -47,18 +46,6 @@
 #define ETP_FINGER_WIDTH       15
 #define ETP_RETRY_COUNT                3
 
-#define ETP_MAX_FINGERS                5
-#define ETP_FINGER_DATA_LEN    5
-#define ETP_REPORT_ID          0x5D
-#define ETP_REPORT_ID2         0x60    /* High precision report */
-#define ETP_TP_REPORT_ID       0x5E
-#define ETP_REPORT_ID_OFFSET   2
-#define ETP_TOUCH_INFO_OFFSET  3
-#define ETP_FINGER_DATA_OFFSET 4
-#define ETP_HOVER_INFO_OFFSET  30
-#define ETP_MK_DATA_OFFSET     33      /* For high precision reports */
-#define ETP_MAX_REPORT_LEN     39
-
 /* The main device structure */
 struct elan_tp_data {
        struct i2c_client       *client;
@@ -1076,6 +1063,7 @@ static irqreturn_t elan_isr(int irq, void *dev_id)
                elan_report_absolute(data, report, true);
                break;
        case ETP_TP_REPORT_ID:
+       case ETP_TP_REPORT_ID2:
                elan_report_trackpoint(data, report);
                break;
        default:
@@ -1414,6 +1402,7 @@ static const struct i2c_device_id elan_id[] = {
 MODULE_DEVICE_TABLE(i2c, elan_id);
 
 #ifdef CONFIG_ACPI
+#include <linux/input/elan-i2c-ids.h>
 MODULE_DEVICE_TABLE(acpi, elan_acpi_id);
 #endif