isert-scst: Shorten the compiler include path (merge r6311 from trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6553 d57e44dd-8a1f-0410-8b47-8ef2f437770f

iscsi-scst/kernel/isert-scst/Makefile

@@ -25,7 +25,7 @@ cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
 enable-Wextra = $(shell uname_r="$$(uname -r)"; if [ "$${uname_r%.el5}" = "$${uname_r}" ]; then echo "$(1)"; fi)
 
 LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
-EXTRA_CFLAGS += -I$(src)/../../include -I$(src)/../ -I$(SCST_INC_DIR)
+EXTRA_CFLAGS += -I$(src)/../../include -I$(SCST_INC_DIR)
 EXTRA_CFLAGS += $(call enable-Wextra,-Wextra \
 	$(call cc-option,-Wno-old-style-declaration) \
 	-Wno-unused-parameter -Wno-missing-field-initializers)

iscsi-scst/kernel/isert-scst/iser_datamover.h

@@ -36,7 +36,7 @@
 #ifndef __ISER_DATAMOVER_H__
 #define __ISER_DATAMOVER_H__
 
-#include "iscsi.h"
+#include "../iscsi.h"
 
 /* iscsi layer calling iser */
 int isert_datamover_init(void);

iscsi-scst/kernel/isert-scst/iser_hdr.h

@@ -36,7 +36,7 @@
 #ifndef __ISER_HDR_H__
 #define __ISER_HDR_H__
 
-#include "iscsi.h"
+#include "../iscsi.h"
 
 #define ISCSI_LOGIN_MAX_RDSL      (8 * 1024)
 

iscsi-scst/kernel/isert-scst/iser_pdu.c

@@ -38,7 +38,7 @@
 #include <linux/kernel.h>
 
 #include "iser.h"
-#include "iscsi.h"
+#include "../iscsi.h"
 #include "iser_datamover.h"
 
 static inline int isert_pdu_rx_buf_init(struct isert_cmnd *isert_pdu,

iscsi-scst/kernel/isert-scst/isert.h

@@ -54,12 +54,11 @@
 #ifdef INSIDE_KERNEL_TREE
 #include <scst/isert_scst.h>
 #include <scst/iscsi_scst.h>
-#include <scst/iscsi.h>
 #else
 #include "isert_scst.h"
 #include "iscsi_scst.h"
-#include "iscsi.h"
 #endif
+#include "../iscsi.h"
 
 #include "iser_hdr.h"
 

iscsi-scst/kernel/isert-scst/isert_login.c

@@ -40,13 +40,7 @@
 #include <linux/poll.h>
 #include <linux/freezer.h>
 #include <linux/file.h>
-
-#ifdef INSIDE_KERNEL_TREE
-#include <scst/iscsi.h>
-#else
-#include "iscsi.h"
-#endif
-
+#include "../iscsi.h"
 #include "isert.h"
 #include "isert_dbg.h"
 #include "iser_datamover.h"