Merge ../linux-2.6

[linux-2.6] / include / linux / major.h

diff --git a/include/linux/major.h b/include/linux/major.h
index 7e7c9093919af3ab51461e7c14c849008ca582d6..53d5fafd85c30a61e381f7d3762fa6a3841aca6c 100644 (file)
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -53,7 +53,7 @@
 #define STL_SIOMEMMAJOR                28
 #define ACSI_MAJOR             28
 #define AZTECH_CDROM_MAJOR     29
-#define GRAPHDEV_MAJOR         29   /* SparcLinux & Linux/68k /dev/fb */
+#define FB_MAJOR               29   /* /dev/fb* framebuffers */
 #define CM206_CDROM_MAJOR      32
 #define IDE2_MAJOR             33
 #define IDE3_MAJOR             34
@@ -158,6 +158,8 @@
 #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