diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 18:20:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 18:20:50 +0100 |
| commit | 5743695b0dd2c775b71d3d4541c243df3da964db (patch) | |
| tree | 8220816fb97638642671bb66f1f2f02b0fb2f39d /drivers | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | Input: lifebook - fix settings for CF-72 (diff) | |
| download | linux-5743695b0dd2c775b71d3d4541c243df3da964db.tar.xz linux-5743695b0dd2c775b71d3d4541c243df3da964db.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: lifebook - fix settings for CF-72
Input: psmouse - fix breakage introduced by b7802c5c1ea
Diffstat (limited to 'drivers')
| -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[] = { .matches = { DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"), }, - .callback = lifebook_set_serio_phys, - .driver_data = "isa0060/serio3", + .callback = lifebook_set_6byte_proto, }, { .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) static int psmouse_extensions(struct psmouse *psmouse, unsigned int max_proto, bool set_properties) { - bool synaptics_hardware = true; + bool synaptics_hardware = false; /* * We always check for lifebook because it does not disturb mouse |