Merge branch 'linus' into sched/core

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

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index adaf3c15e44974805c4444b4b2772e81496de4cd..8b5f7cc0fba6cd9f5f69f5521d00c788c2fe0dc9 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -30,6 +30,7 @@
 #define HPET_MINOR             228
 #define FUSE_MINOR             229
 #define KVM_MINOR              232
+#define VHOST_NET_MINOR                233
 #define MISC_DYNAMIC_MINOR     255
 
 struct device;