PATCH [14/18] qla2xxx: Use proper include files

From: Andrew Vasquez <andrew.vasquez@qlogic.com>

  Use the standard include/scsi/* headers rather than those in
  drivers/scsi/.  Slightly modified variant from initial patch sent by
  Christoph Hellwig <hch () lst !de>.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
(fixed rejections)

drivers/scsi/qla2xxx/Makefile

-EXTRA_CFLAGS += -Idrivers/scsi -DUNIQUE_FW_NAME
+EXTRA_CFLAGS += -DUNIQUE_FW_NAME
 
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_rscn.o

drivers/scsi/qla2xxx/qla_os.h

@@ -58,11 +58,13 @@
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
 
-#include "scsi.h"
+#include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
-
-#include <scsi/scsicam.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_tcq.h>
 #include <scsi/scsi_ioctl.h>
+#include <scsi/scsicam.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>