Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / linux / phonedev.h

diff --git a/include/linux/phonedev.h b/include/linux/phonedev.h
index d54049eed0c395a9ae762404554ac1c37a65123d..4269de99e320afae47c4e96428636f07286668a6 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;