From: Peter Hutterer <[email protected]>
Signed-off-by: Peter Hutterer <[email protected]>
Acked-by: Benjamin Tissoires <[email protected]>
Reviewed-by: Ping Cheng <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
[[email protected]: Imported into input-wacom repository (86c03f4)]
Signed-off-by: Jason Gerecke <[email protected]>
[[email protected]: backported from input-wacom repository 466f637]
Signed-off-by: Jason Gerecke <[email protected]>
---
2.6.30/wacom_w8001.c | 3 ++-
2.6.36/wacom_w8001.c | 3 ++-
2.6.38/wacom_w8001.c | 3 ++-
3.7/wacom_w8001.c | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/2.6.30/wacom_w8001.c b/2.6.30/wacom_w8001.c
index 4dbc81f..15e401e 100755
--- a/2.6.30/wacom_w8001.c
+++ b/2.6.30/wacom_w8001.c
@@ -451,7 +451,8 @@ static int w8001_connect(struct serio *serio, struct
serio_driver *drv)
input_dev->id.version = 0x0100;
input_dev->dev.parent = &serio->dev;
- input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+ __set_bit(EV_KEY, input_dev->evbit);
+ __set_bit(EV_ABS, input_dev->evbit);
serio_set_drvdata(serio, w8001);
err = serio_open(serio, drv);
diff --git a/2.6.36/wacom_w8001.c b/2.6.36/wacom_w8001.c
index 7cfd85e..03db1de 100755
--- a/2.6.36/wacom_w8001.c
+++ b/2.6.36/wacom_w8001.c
@@ -510,7 +510,8 @@ static int w8001_connect(struct serio *serio, struct
serio_driver *drv)
input_dev->id.version = 0x0100;
input_dev->dev.parent = &serio->dev;
- input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+ __set_bit(EV_KEY, input_dev->evbit);
+ __set_bit(EV_ABS, input_dev->evbit);
serio_set_drvdata(serio, w8001);
err = serio_open(serio, drv);
diff --git a/2.6.38/wacom_w8001.c b/2.6.38/wacom_w8001.c
index 3812a59..0c65351 100644
--- a/2.6.38/wacom_w8001.c
+++ b/2.6.38/wacom_w8001.c
@@ -393,7 +393,8 @@ static int w8001_setup(struct w8001 *w8001)
msleep(250); /* wait 250ms before querying the device */
- dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+ __set_bit(EV_KEY, dev->evbit);
+ __set_bit(EV_ABS, dev->evbit);
strlcat(w8001->name, "Wacom Serial", sizeof(w8001->name));
__set_bit(INPUT_PROP_DIRECT, dev->propbit);
diff --git a/3.7/wacom_w8001.c b/3.7/wacom_w8001.c
index 2792ca3..d194d57 100644
--- a/3.7/wacom_w8001.c
+++ b/3.7/wacom_w8001.c
@@ -393,7 +393,8 @@ static int w8001_setup(struct w8001 *w8001)
msleep(250); /* wait 250ms before querying the device */
- dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+ __set_bit(EV_KEY, dev->evbit);
+ __set_bit(EV_ABS, dev->evbit);
strlcat(w8001->name, "Wacom Serial", sizeof(w8001->name));
__set_bit(INPUT_PROP_DIRECT, dev->propbit);
--
2.7.1
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
