From 89b35b8b9d1858448ac0e77545b4ea0a746a6f90 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 9 Sep 2010 15:38:31 +0000 Subject: [PATCH] Even more upstream include path conversions. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2077 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 | 2 +- scst/src/dev_handlers/scst_dev_handler.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 index 940c7416d..f933b36f7 100644 --- a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.35 @@ -1,4 +1,4 @@ -ccflags-y += -Iinclude/scst -Wno-unused-parameter +ccflags-y += -Wno-unused-parameter obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \ scst_vdisk.o scst_raid.o scst_processor.o scst_user.o diff --git a/scst/src/dev_handlers/scst_dev_handler.h b/scst/src/dev_handlers/scst_dev_handler.h index c147270aa..224b7e5ee 100644 --- a/scst/src/dev_handlers/scst_dev_handler.h +++ b/scst/src/dev_handlers/scst_dev_handler.h @@ -3,7 +3,11 @@ #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include "scst_debug.h" +#endif #define SCST_DEV_UA_RETRIES 5 #define SCST_PASSTHROUGH_RETRIES 0