git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[safe/jmp/linux-2.6]
/
drivers
/
input
/
touchscreen
/
penmount.c
diff --git
a/drivers/input/touchscreen/penmount.c
b/drivers/input/touchscreen/penmount.c
index
bd27679
..
c7f9ceb
100644
(file)
--- a/
drivers/input/touchscreen/penmount.c
+++ b/
drivers/input/touchscreen/penmount.c
@@
-105,17
+105,16
@@
static int pm_connect(struct serio *serio, struct serio_driver *drv)
pm->dev = input_dev;
snprintf(pm->phys, sizeof(pm->phys), "%s/input0", serio->phys);
pm->dev = input_dev;
snprintf(pm->phys, sizeof(pm->phys), "%s/input0", serio->phys);
- input_dev->private = pm;
input_dev->name = "Penmount Serial TouchScreen";
input_dev->phys = pm->phys;
input_dev->id.bustype = BUS_RS232;
input_dev->id.vendor = SERIO_PENMOUNT;
input_dev->id.product = 0;
input_dev->id.version = 0x0100;
input_dev->name = "Penmount Serial TouchScreen";
input_dev->phys = pm->phys;
input_dev->id.bustype = BUS_RS232;
input_dev->id.vendor = SERIO_PENMOUNT;
input_dev->id.product = 0;
input_dev->id.version = 0x0100;
- input_dev->
cdev.dev
= &serio->dev;
+ input_dev->
dev.parent
= &serio->dev;
- input_dev->evbit[0] = BIT
(EV_KEY) | BIT
(EV_ABS);
- input_dev->keybit[
LONG(BTN_TOUCH)] = BIT
(BTN_TOUCH);
+ input_dev->evbit[0] = BIT
_MASK(EV_KEY) | BIT_MASK
(EV_ABS);
+ input_dev->keybit[
BIT_WORD(BTN_TOUCH)] = BIT_MASK
(BTN_TOUCH);
input_set_abs_params(pm->dev, ABS_X, 0, 0x3ff, 0, 0);
input_set_abs_params(pm->dev, ABS_Y, 0, 0x3ff, 0, 0);
input_set_abs_params(pm->dev, ABS_X, 0, 0x3ff, 0, 0);
input_set_abs_params(pm->dev, ABS_Y, 0, 0x3ff, 0, 0);