Merge commit 'origin/master' into next

1 files changed, 1 insertions, 0 deletions

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