Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[cascardo/linux.git] / include / linux / major.h

diff --git a/include/linux/major.h b/include/linux/major.h
index 4b62c42..0a74c52 100644 (file)
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -100,6 +100,7 @@
 #define I2O_MAJOR              80      /* 80->87 */
 
 #define SHMIQ_MAJOR            85   /* Linux/mips, SGI /dev/shmiq */
+#define SCSI_CHANGER_MAJOR      86
 
 #define IDE6_MAJOR             88
 #define IDE7_MAJOR             89
@@ -112,6 +113,7 @@
 
 #define UBD_MAJOR              98
 
+#define PP_MAJOR               99
 #define JSFD_MAJOR             99
 
 #define PHONE_MAJOR            100