diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/input/input.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
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? */ |