Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit 95317efc authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw:drv: prioritise locally provided FMC over the one from the kernel [IMPROVE] 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 0e644a55
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
kernel/Kbuild
View file @ 95317efc
......@@ -19,13 +19,16 @@ SUBMODULE_VERSIONS-y += MODULE_INFO(version_zio,\"$(ZIO_VERSION)\");
ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS-y)"
ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\" \
-I$(ZIO_ABS)/include \
-iquote $(FMC_ABS)/include \
-I$(FMC_ABS)/include \
-I $(VMEBUS_ABS)/driver \
-I$(src)
ccflags-$(CONFIG_FMC_ADC_SVEC) += -I$(VMEBUS_ABS)/include
ccflags-$(CONFIG_FMC_ADC_DEBUG) += -DDEBUG
# include our header before to avoid conflicts with the kernel
LINUXINCLUDE := -I$(FMC_ABS)/include $(LINUXINCLUDE)
# Extract ZIO minimum compatible version
ccflags-y += -D__ZIO_MIN_MAJOR_VERSION=$(shell echo $(ZIO_VERSION) | cut -d '-' -f 1 | cut -d '.' -f 1 | tr -d 'v'; )
ccflags-y += -D__ZIO_MIN_MINOR_VERSION=$(shell echo $(ZIO_VERSION) | cut -d '-' -f 1 | cut -d '.' -f 2; )
......
kernel/fa-core.c
View file @ 95317efc
......@@ -10,8 +10,8 @@
#include <linux/version.h>
#include <linux/dmaengine.h>
#include <linux/mod_devicetable.h>
#include "linux/ipmi-fru.h"
#include "linux/fmc.h"
#include <linux/ipmi-fru.h>
#include <linux/fmc.h>
#include "fmc-adc-100m14b4cha.h"
......
kernel/fmc-adc-100m14b4cha.h
View file @ 95317efc
......@@ -159,7 +159,7 @@ struct fa_calib {
#include <linux/workqueue.h>
#include <linux/debugfs.h>
#include <linux/platform_device.h>
#include "linux/fmc.h"
#include <linux/fmc.h>
#include <linux/zio.h>
#include <linux/zio-dma.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment