diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
| commit | 94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch) | |
| tree | 5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /drivers/macintosh/adbhid.c | |
| parent | 3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff) | |
| parent | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'drivers/macintosh/adbhid.c')
| -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; |