diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /drivers/macintosh | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/adbhid.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index cdb6d0283195..8f02c155fdc0 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
| @@ -723,6 +723,7 @@ adbhid_input_register(int id, int default_id, int original_handler_id, | |||
| 723 | 723 | ||
| 724 | sprintf(hid->phys, "adb%d:%d.%02x/input", id, default_id, original_handler_id); | 724 | sprintf(hid->phys, "adb%d:%d.%02x/input", id, default_id, original_handler_id); |
| 725 | 725 | ||
| 726 | hid->input = input_dev; | ||
| 726 | hid->id = default_id; | 727 | hid->id = default_id; |
| 727 | hid->original_handler_id = original_handler_id; | 728 | hid->original_handler_id = original_handler_id; |
| 728 | hid->current_handler_id = current_handler_id; | 729 | hid->current_handler_id = current_handler_id; |