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

Signed-off-by: Federico Vaga <federico.vaga@gmail.com>

fmc-bus: do not use kernel headers, use local ones
Signed-off-by: Federico Vaga <federico.vaga@gmail.com>
92318566 · Federico Vaga · 3edba6cb · 74a29b07 · 92318566 · b3cfb156
Commit 92318566 authored Aug 25, 2015 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

fmc-bus fmc-bus +1 -1

Makefile kernel/Makefile +3 -2

spec-sw spec-sw +1 -1

No files found.
--- a/fmc-bus @ 74a29b07
+++ b/fmc-bus @ 74a29b07
-Subproject commit 13e4f901ec39bd86e40dbce972b07853c666873f
+Subproject commit 74a29b0770266daa1b7981fc4d7854f14f7177bd
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -15,11 +15,12 @@ ifdef CONFIG_CSM_VERSION
 else
  ccflags-y += -DCERN_SUPER_MODULE=""
 endif
+# 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 += \
 	-I$(ZIO)/include \
-	-I$(FMC_BUS)/kernel/include \
-	-I$(FMC_BUS)/kernel/include/linux \
 	-I$(FMC_BUS) \
 	-I$(src)


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