diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:07:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:07:26 +1100 |
| commit | 84f995ad01d8dd0d993396d2db23c47895cded2f (patch) | |
| tree | 2b79db2581651726a2c78e5cef7d94998e449149 /drivers/hid | |
| parent | 6dde5fd1a9a2e438c60efd89dff10ab856345fc2 (diff) | |
| parent | 0d3c07378bb7d423302d7cb0dcd3fa5a26c40220 (diff) | |
Merge remote-tracking branch 'input/next'
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index f53911dcdc2d..445075c3fafb 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -888,8 +888,8 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) hid->ll_driver->hidinput_input_event; input_dev->open = hidinput_open; input_dev->close = hidinput_close; - input_dev->setkeycode_new = hidinput_setkeycode; - input_dev->getkeycode_new = hidinput_getkeycode; + input_dev->setkeycode = hidinput_setkeycode; + input_dev->getkeycode = hidinput_getkeycode; input_dev->name = hid->name; input_dev->phys = hid->phys; |