summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/adbhid.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-02 05:20:55 +0100
committerPaul Mackerras <paulus@samba.org>2005-11-02 05:20:55 +0100
commitde2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch)
treedfccb1a2717a8a042a87dbade509f894810ea1cd /drivers/macintosh/adbhid.c
parentpowerpc: clean up bug.h further (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6 (diff)
downloadlinux-de2d3dbd17e6bb60bde4632ce1c7df063b073934.tar.xz
linux-de2d3dbd17e6bb60bde4632ce1c7df063b073934.zip
Merge ../linux-2.6
Diffstat (limited to 'drivers/macintosh/adbhid.c')
-rw-r--r--drivers/macintosh/adbhid.c1
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,
sprintf(hid->phys, "adb%d:%d.%02x/input", id, default_id, original_handler_id);
+ hid->input = input_dev;
hid->id = default_id;
hid->original_handler_id = original_handler_id;
hid->current_handler_id = current_handler_id;