Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / include / linux / major.h

diff --git a/include/linux/major.h b/include/linux/major.h
index e36a467..0cb9805 100644 (file)
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -113,6 +113,7 @@
 
 #define UBD_MAJOR              98
 
+#define PP_MAJOR               99
 #define JSFD_MAJOR             99
 
 #define PHONE_MAJOR            100
@@ -151,10 +152,14 @@
 #define USB_ACM_AUX_MAJOR      167
 #define USB_CHAR_MAJOR         180
 
+#define MMC_BLOCK_MAJOR                179
+
 #define VXVM_MAJOR             199     /* VERITAS volume i/o driver    */
 #define VXSPEC_MAJOR           200     /* VERITAS volume config driver */
 #define VXDMP_MAJOR            201     /* VERITAS volume multipath driver */
 
+#define XENVBD_MAJOR           202     /* Xen virtual block device */
+
 #define MSR_MAJOR              202
 #define CPUID_MAJOR            203