imported patch open-iscsi-adjust-for-in-kernel-build

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 7e6b94922d621bcec122d63e07390d2187588858..51f994c5dde327b4ad5eb0468d3711a787a1072a 100644 (file)
--- 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 1b4336d5a8a905241790f228f8d9f9ac18fbb7ec..68c9c2969accb776643ccb687d697105d738df1f 100644 (file)
--- 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 002963d223ef5e60c8154df06bba927868721e5c..33eef4e1968223653b1fdf0f9852832e28e14c4c 100644 (file)
--- 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 505b4260d8f79c19dd313694263e271e6e497fbe..6bb6aec84abe4100e5574909d351bd1a34210b09 100644 (file)
--- 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 803e8d9ff38c371a5b6e058e817ec0fea2523cba..7668325f180b4c5cc9a5aa7fe098cf8e2fb2c064 100644 (file)
--- 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