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>
6cd90be1 · Federico Vaga · f34a4cbd · 74a29b07 · 6cd90be1
Commit 6cd90be1 authored Aug 25, 2015 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

fmc-bus fmc-bus +1 -1

Makefile kernel/Makefile +4 -1

No files found.
--- a/fmc-bus @ 74a29b07
+++ b/fmc-bus @ 74a29b07
-Subproject commit 13e4f901ec39bd86e40dbce972b07853c666873f
+Subproject commit 74a29b0770266daa1b7981fc4d7854f14f7177bd
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -12,7 +12,10 @@ else
  ccflags-y += -DCERN_SUPER_MODULE=""
 endif

-ccflags-y += -I$(FMC_BUS)/kernel/include
+# 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 $(LINUXINCLUDE)
+
 ccflags-y += -DDEBUG
 ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\"