Manual merge with Linus.

[karo-tx-linux.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index cf30f3cb191ac68cf24bfeff1266de830fee2ffd..393da04f4301c30750a80699d88c9043c51700d1 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -957,7 +957,7 @@ struct input_handler {
        struct input_handle* (*connect)(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id);
        void (*disconnect)(struct input_handle *handle);
 
-       struct file_operations *fops;
+       const struct file_operations *fops;
        int minor;
        char *name;