Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git...

[profile/ivi/kernel-x86-ivi.git] / include / linux / major.h

diff --git a/include/linux/major.h b/include/linux/major.h
index 8824945..058ec15 100644 (file)
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -171,5 +171,6 @@
 #define VIOTAPE_MAJOR          230
 
 #define BLOCK_EXT_MAJOR                259
+#define SCSI_OSD_MAJOR         260     /* open-osd's OSD scsi device */
 
 #endif