fmc-bus: do not use kernel headers, use local ones

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

fmc-bus: do not use kernel headers, use local ones
Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
b0dcb942 · Federico Vaga · 27f3fc42 · 74a29b07 · b0dcb942 · b3cfb156
Commit b0dcb942 authored Aug 25, 2015 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

fmc-bus fmc-bus +1 -1

Makefile kernel/Makefile +6 -3

spec-sw spec-sw +1 -1

No files found.
--- a/fmc-bus @ 74a29b07
+++ b/fmc-bus @ 74a29b07
-Subproject commit 594a9cc8fe7945d06db13a365a1047b92a3b92ea
+Subproject commit 74a29b0770266daa1b7981fc4d7854f14f7177bd
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -8,13 +8,16 @@ KBUILD_EXTRA_SYMBOLS := \

 GIT_VERSION = $(shell cd $(src); git describe --always --dirty --long --tags)

+# The library includes <sdb.h>, so point -I directtly there
+# include our header before to avoid conflicts with the kernel
+LINUXINCLUDE := -I$(FMC_BUS)/kernel/include -I$(FMC_BUS)/kernel/include/linux $(LINUXINCLUDE)
+
 ccflags-y = -DGIT_VERSION=\"$(GIT_VERSION)\" \
 	-I$(src) \
 	-I$(ZIO)/include \
-	-I$(FMC_BUS)/kernel/include \
-	-I$(FMC_BUS)/kernel/include/linux \
-	-I$(FMC_BUS)/sdb-lib \
+	-I$(FMC_BUS)/sdb-lib/ \
 	-I$(SPEC_SW)/kernel
+
 ccflags-$(CONFIG_FMC_TDC_DEBUG) += -DDEBUG
 ccflags-$(CONFIG_FMC_TDC_VERBOSE_DEBUG) += -DVERBOSE_DEBUG


--- a/spec-sw @ b3cfb156
+++ b/spec-sw @ b3cfb156
-Subproject commit da2cf7b68de32d6f11b1c3f5b729963e620dc56e
+Subproject commit b3cfb15654d0cca617f8631e366a0bbff73ea21f