diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:30:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:30:29 -0500 |
| commit | 115b2ce1c3b974e43e45fa6c9e20cd7271a01dff (patch) | |
| tree | 9a883fb4d84713f142c4e003fead92381c11b6c2 /drivers/input/input.c | |
| parent | dd49f96777d5a72d5591ac2112d4ac940391774e (diff) | |
| parent | 5fc4e6e197c7e377f1c8ebec727d40df983aceed (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index ef5824c8846b..fe33ff334e27 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
| @@ -477,8 +477,8 @@ static int __init input_proc_init(void) | |||
| 477 | 477 | ||
| 478 | entry->owner = THIS_MODULE; | 478 | entry->owner = THIS_MODULE; |
| 479 | input_fileops = *entry->proc_fops; | 479 | input_fileops = *entry->proc_fops; |
| 480 | input_fileops.poll = input_devices_poll; | ||
| 480 | entry->proc_fops = &input_fileops; | 481 | entry->proc_fops = &input_fileops; |
| 481 | entry->proc_fops->poll = input_devices_poll; | ||
| 482 | 482 | ||
| 483 | entry = create_proc_read_entry("handlers", 0, proc_bus_input_dir, input_handlers_read, NULL); | 483 | entry = create_proc_read_entry("handlers", 0, proc_bus_input_dir, input_handlers_read, NULL); |
| 484 | if (!entry) | 484 | if (!entry) |