diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-26 01:52:21 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-26 01:52:21 +0200 |
| commit | 5ffdcd94ea0171cf9a3ca63051c2246426103b5b (patch) | |
| tree | dfa1522796d5af649caf64ac6e2f1e69119e85d0 /drivers/input/keyboard/w90p910_keypad.c | |
| parent | spi/mpc5121: change annotations for probe and remove functions (diff) | |
| parent | Linux 2.6.35-rc6 (diff) | |
| download | linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.tar.xz linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.zip | |
Merge commit 'v2.6.35-rc6' into spi/test
Diffstat (limited to 'drivers/input/keyboard/w90p910_keypad.c')
| -rw-r--r-- | drivers/input/keyboard/w90p910_keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c index 4ef764cc493c..ee2bf6bcf291 100644 --- a/drivers/input/keyboard/w90p910_keypad.c +++ b/drivers/input/keyboard/w90p910_keypad.c @@ -258,7 +258,7 @@ static struct platform_driver w90p910_keypad_driver = { .probe = w90p910_keypad_probe, .remove = __devexit_p(w90p910_keypad_remove), .driver = { - .name = "nuc900-keypad", + .name = "nuc900-kpi", .owner = THIS_MODULE, }, }; |