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

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

diff --git a/include/linux/sunrpc/stats.h b/include/linux/sunrpc/stats.h
index 0d6ed3c8bdc4c75811a3442e2495f70088afdab0..5fa0f20843078a94c8822ef1a1ace6cc5d0ae2c0 100644 (file)
--- a/include/linux/sunrpc/stats.h
+++ b/include/linux/sunrpc/stats.h
@@ -9,7 +9,6 @@
 #ifndef _LINUX_SUNRPC_STATS_H
 #define _LINUX_SUNRPC_STATS_H
 
-#include <linux/config.h>
 #include <linux/proc_fs.h>
 
 struct rpc_stat {
@@ -50,7 +49,7 @@ struct proc_dir_entry *       rpc_proc_register(struct rpc_stat *);
 void                   rpc_proc_unregister(const char *);
 void                   rpc_proc_zero(struct rpc_program *);
 struct proc_dir_entry *        svc_proc_register(struct svc_stat *,
-                                         struct file_operations *);
+                                         const struct file_operations *);
 void                   svc_proc_unregister(const char *);
 
 void                   svc_seq_show(struct seq_file *,
@@ -65,7 +64,7 @@ static inline void rpc_proc_unregister(const char *p) {}
 static inline void rpc_proc_zero(struct rpc_program *p) {}
 
 static inline struct proc_dir_entry *svc_proc_register(struct svc_stat *s,
-                                                      struct file_operations *f) { return NULL; }
+                                                      const struct file_operations *f) { return NULL; }
 static inline void svc_proc_unregister(const char *p) {}
 
 static inline void svc_seq_show(struct seq_file *seq,