Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[pandora-kernel.git] / include / linux / phonedev.h

diff --git a/include/linux/phonedev.h b/include/linux/phonedev.h
index d54049e..4269de9 100644 (file)
--- a/include/linux/phonedev.h
+++ b/include/linux/phonedev.h
@@ -2,7 +2,6 @@
 #define __LINUX_PHONEDEV_H
 
 #include <linux/types.h>
-#include <linux/version.h>
 
 #ifdef __KERNEL__
 
@@ -10,7 +9,7 @@
 
 struct phone_device {
        struct phone_device *next;
-       struct file_operations *f_op;
+       const struct file_operations *f_op;
        int (*open) (struct phone_device *, struct file *);
        int board;              /* Device private index */
        int minor;