diff options
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/mouse/lifebook.c | 3 | ||||
-rw-r--r-- | drivers/input/mouse/psmouse-base.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c index 5e6308694408..82811558ec33 100644 --- a/drivers/input/mouse/lifebook.c +++ b/drivers/input/mouse/lifebook.c | |||
@@ -107,8 +107,7 @@ static const struct dmi_system_id lifebook_dmi_table[] = { | |||
107 | .matches = { | 107 | .matches = { |
108 | DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"), | 108 | DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"), |
109 | }, | 109 | }, |
110 | .callback = lifebook_set_serio_phys, | 110 | .callback = lifebook_set_6byte_proto, |
111 | .driver_data = "isa0060/serio3", | ||
112 | }, | 111 | }, |
113 | { | 112 | { |
114 | .ident = "Lifebook B142", | 113 | .ident = "Lifebook B142", |
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 5bd64841bf1c..07c53798301a 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
@@ -581,7 +581,7 @@ static int cortron_detect(struct psmouse *psmouse, bool set_properties) | |||
581 | static int psmouse_extensions(struct psmouse *psmouse, | 581 | static int psmouse_extensions(struct psmouse *psmouse, |
582 | unsigned int max_proto, bool set_properties) | 582 | unsigned int max_proto, bool set_properties) |
583 | { | 583 | { |
584 | bool synaptics_hardware = true; | 584 | bool synaptics_hardware = false; |
585 | 585 | ||
586 | /* | 586 | /* |
587 | * We always check for lifebook because it does not disturb mouse | 587 | * We always check for lifebook because it does not disturb mouse |