Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / include / linux / miscdevice.h

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index a820f816a49e8dbf9553c2898b65a25dda9c7ceb..052117744629bfd05e300528f99e5675574dda3e 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -26,6 +26,7 @@
 #define TUN_MINOR              200
 #define MWAVE_MINOR            219     /* ACP/Mwave Modem */
 #define MPT_MINOR              220
+#define MPT2SAS_MINOR          221
 #define HPET_MINOR             228
 #define FUSE_MINOR             229
 #define KVM_MINOR              232
@@ -40,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);