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
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6]
/
drivers
/
input
/
mouse
/
touchkit_ps2.c
diff --git
a/drivers/input/mouse/touchkit_ps2.c
b/drivers/input/mouse/touchkit_ps2.c
index
3fadb2a
..
88121c5
100644
(file)
--- a/
drivers/input/mouse/touchkit_ps2.c
+++ b/
drivers/input/mouse/touchkit_ps2.c
@@
-26,7
+26,6
@@
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
-#include <linux/slab.h>
#include <linux/input.h>
#include <linux/serio.h>
#include <linux/input.h>
#include <linux/serio.h>
@@
-67,7
+66,7
@@
static psmouse_ret_t touchkit_ps2_process_byte(struct psmouse *psmouse)
return PSMOUSE_FULL_PACKET;
}
return PSMOUSE_FULL_PACKET;
}
-int touchkit_ps2_detect(struct psmouse *psmouse,
int
set_properties)
+int touchkit_ps2_detect(struct psmouse *psmouse,
bool
set_properties)
{
struct input_dev *dev = psmouse->dev;
unsigned char param[3];
{
struct input_dev *dev = psmouse->dev;
unsigned char param[3];
@@
-86,7
+85,8
@@
int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties)
if (set_properties) {
dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
if (set_properties) {
dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
- set_bit(BTN_TOUCH, dev->keybit);
+ dev->keybit[BIT_WORD(BTN_MOUSE)] = 0;
+ dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
input_set_abs_params(dev, ABS_X, 0, TOUCHKIT_MAX_XC, 0, 0);
input_set_abs_params(dev, ABS_Y, 0, TOUCHKIT_MAX_YC, 0, 0);
input_set_abs_params(dev, ABS_X, 0, TOUCHKIT_MAX_XC, 0, 0);
input_set_abs_params(dev, ABS_Y, 0, TOUCHKIT_MAX_YC, 0, 0);