diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-02 23:38:13 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-02 23:38:13 -0800 |
| commit | 467832032cc07626880363efa8625719c16c04eb (patch) | |
| tree | ee9a62c04f0b3106e412bc1b2dd1cea5566d5ca7 /drivers/input/mouse/lifebook.c | |
| parent | Input: keyboard - fix lack of locking when traversing handler->h_list (diff) | |
| parent | Linux 2.6.32 (diff) | |
| download | linux-dev-467832032cc07626880363efa8625719c16c04eb.tar.xz linux-dev-467832032cc07626880363efa8625719c16c04eb.zip | |
Merge commit 'v2.6.32' into next
Diffstat (limited to 'drivers/input/mouse/lifebook.c')
| -rw-r--r-- | drivers/input/mouse/lifebook.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c index 4c254876609f..54b7f64d6e62 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", |