Manual merge with Linus.

[linux-2.6.git] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 3e22bb11ee05a4b38b5503e2203268bc78776544..de94ffcb09957e11b259acbe232ad110958ae6fd 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -924,7 +924,7 @@ void input_unregister_handler(struct input_handler *handler)
 static int input_open_file(struct inode *inode, struct file *file)
 {
        struct input_handler *handler = input_table[iminor(inode) >> 5];
 static int input_open_file(struct inode *inode, struct file *file)
 {
        struct input_handler *handler = input_table[iminor(inode) >> 5];

-       struct file_operations *old_fops, *new_fops = NULL;
+       const struct file_operations *old_fops, *new_fops = NULL;

        int err;
 
        /* No load-on-demand here? */
        int err;
 
        /* No load-on-demand here? */