Merge branch 'master' into upstream

1 files changed, 2 insertions, 3 deletions

diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index 176e2d371577..047567d34ca7 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -58,9 +58,8 @@ struct dentry *debugfs_create_blob(const char *name, mode_t mode,
  */
 
 static inline struct dentry *debugfs_create_file(const char *name, mode_t mode,
-                                                 struct dentry *parent,
-                                                 void *data,
-                                                 struct file_operations *fops)
+                                        struct dentry *parent, void *data,
+                                        const struct file_operations *fops)
 {
         return ERR_PTR(-ENODEV);
 }