dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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 b7802c5c1e
This commit is contained in:
Linus Torvalds 2009-11-17 09:20:50 -08:00
parent 8a1eaa6a56 b1e69aae77
commit 5743695b0d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/input/mouse/lifebook.c
View File

@ -107,8 +107,7 @@ static const struct dmi_system_id lifebook_dmi_table[] = {
.matches = { .matches = {
DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"), DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"),
}, },
.callback = lifebook_set_serio_phys, .callback = lifebook_set_6byte_proto,
.driver_data = "isa0060/serio3",
}, },
{ {
.ident = "Lifebook B142", .ident = "Lifebook B142",

2
drivers/input/mouse/psmouse-base.c
View File

@ -581,7 +581,7 @@ static int cortron_detect(struct psmouse *psmouse, bool set_properties)
static int psmouse_extensions(struct psmouse *psmouse, static int psmouse_extensions(struct psmouse *psmouse,
unsigned int max_proto, bool set_properties) 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 * We always check for lifebook because it does not disturb mouse