Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[linux.git] / drivers / scsi / mpt3sas / mpt3sas_ctl.h

diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.h b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
index aee99ce67e54ec8355e51eedf98039a4488d399e..89408356d252432b4d57f9ae3964ec4d1381b14a 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
@@ -50,10 +50,13 @@
 #include <linux/miscdevice.h>
 #endif
 
-
+#ifndef MPT2SAS_MINOR
+#define MPT2SAS_MINOR          (MPT_MINOR + 1)
+#endif
 #ifndef MPT3SAS_MINOR
 #define MPT3SAS_MINOR          (MPT_MINOR + 2)
 #endif
+#define MPT2SAS_DEV_NAME       "mpt2ctl"
 #define MPT3SAS_DEV_NAME       "mpt3ctl"
 #define MPT3_MAGIC_NUMBER      'L'
 #define MPT3_IOCTL_DEFAULT_TIMEOUT (10) /* in seconds */
@@ -138,6 +141,7 @@ struct mpt3_ioctl_pci_info {
 #define MPT2_IOCTL_INTERFACE_FC_IP     (0x02)
 #define MPT2_IOCTL_INTERFACE_SAS       (0x03)
 #define MPT2_IOCTL_INTERFACE_SAS2      (0x04)
+#define MPT2_IOCTL_INTERFACE_SAS2_SSS6200      (0x05)
 #define MPT3_IOCTL_INTERFACE_SAS3      (0x06)
 #define MPT2_IOCTL_VERSION_LENGTH      (32)