Merge branch 'svn-trunk'

qla2x00t-32gbit/qla_nvme.c

@@ -6,10 +6,10 @@
  */
 
 #include <linux/version.h>
+#include "qla_nvme.h"
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
 
-#include "qla_nvme.h"
 #include <linux/scatterlist.h>
 #include <linux/delay.h>
 #include <linux/nvme.h>
@@ -726,4 +726,10 @@ int qla_nvme_register_hba(struct scsi_qla_host *vha)
 	return ret;
 }
 
+#else
+
+void qla_nvme_unregister_remote_port(struct fc_port *fcport)
+{
+}
+
 #endif