From 5d7ec971f72d27549919b224ef3de21060cd50df Mon Sep 17 00:00:00 2001
From: t_jeang <devnull@localhost>
Date: Tue, 6 Jan 2009 12:06:00 +0000
Subject: [PATCH] imported patch open-iscsi-adjust-for-in-kernel-build

---
 drivers/scsi/iscsi_tcp.c            | 2 +-
 drivers/scsi/iscsi_tcp.h            | 2 +-
 drivers/scsi/libiscsi.c             | 6 +++---
 drivers/scsi/scsi_transport_iscsi.c | 4 ++--
 include/scsi/iscsi_if.h             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 7e6b9492..51f994c5 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -40,7 +40,7 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi.h>
-#include "scsi_transport_iscsi.h"
+#include <scsi/scsi_transport_iscsi.h>
 
 #include "iscsi_tcp.h"
 
diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h
index 1b4336d5..68c9c296 100644
--- a/drivers/scsi/iscsi_tcp.h
+++ b/drivers/scsi/iscsi_tcp.h
@@ -22,7 +22,7 @@
 #ifndef ISCSI_TCP_H
 #define ISCSI_TCP_H
 
-#include "libiscsi.h"
+#include <scsi/libiscsi.h>
 
 /* Socket's Receive state machine */
 #define IN_PROGRESS_WAIT_HEADER		0x0
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 002963d2..33eef4e1 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -33,9 +33,9 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_transport.h>
-#include "iscsi_proto.h"
-#include "scsi_transport_iscsi.h"
-#include "libiscsi.h"
+#include <scsi/iscsi_proto.h>
+#include <scsi/scsi_transport_iscsi.h>
+#include <scsi/libiscsi.h>
 
 struct iscsi_session *
 class_to_transport_session(struct iscsi_cls_session *cls_session)
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 505b4260..6bb6aec8 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -27,8 +27,8 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_transport.h>
-#include "scsi_transport_iscsi.h"
-#include "iscsi_if.h"
+#include <scsi/scsi_transport_iscsi.h>
+#include <scsi/iscsi_if.h>
 #include "iscsi_2.6.22_compat.h"
 
 #define ISCSI_SESSION_ATTRS 16
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 803e8d9f..7668325f 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -21,7 +21,7 @@
 #ifndef ISCSI_IF_H
 #define ISCSI_IF_H
 
-#include <iscsi_proto.h>
+#include <scsi/iscsi_proto.h>
 
 #define UEVENT_BASE			10
 #define KEVENT_BASE			100
-- 
2.39.5