diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
| commit | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (patch) | |
| tree | c1f458722f86690a6172bbac2dfef3241ba0ec7e /drivers/input/input.c | |
| parent | 94c2d01a537daf51a9fcf229d7d2204c979355d9 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 4fe3da3c667a..f8af0945964e 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
| @@ -923,7 +923,7 @@ void input_unregister_handler(struct input_handler *handler) | |||
| 923 | static int input_open_file(struct inode *inode, struct file *file) | 923 | static int input_open_file(struct inode *inode, struct file *file) |
| 924 | { | 924 | { |
| 925 | struct input_handler *handler = input_table[iminor(inode) >> 5]; | 925 | struct input_handler *handler = input_table[iminor(inode) >> 5]; |
| 926 | struct file_operations *old_fops, *new_fops = NULL; | 926 | const struct file_operations *old_fops, *new_fops = NULL; |
| 927 | int err; | 927 | int err; |
| 928 | 928 | ||
| 929 | /* No load-on-demand here? */ | 929 | /* No load-on-demand here? */ |