Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

[mv-sheeva.git] / include / linux / miscdevice.h

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 052117744629bfd05e300528f99e5675574dda3e..adaf3c15e44974805c4444b4b2772e81496de4cd 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -41,7 +41,8 @@ struct miscdevice  {
        struct list_head list;
        struct device *parent;
        struct device *this_device;
-       const char *devnode;
+       const char *nodename;
+       mode_t mode;
 };
 
 extern int misc_register(struct miscdevice * misc);