Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[firefly-linux-kernel-4.4.55.git] / include / linux / major.h

diff --git a/include/linux/major.h b/include/linux/major.h
index 88249452b935befbc53985e9eb6c997b557346d8..058ec15dd060341391277f6f82f479b151a494eb 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