Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

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

diff --git a/include/linux/major.h b/include/linux/major.h
index 4b62c42b842c2d1d19ff1002a247488d95b1cf6e..0a74c52924c9d60e6feb8668b4cbf3b1046d7dc3 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