Skip to content

S
Simple PCIe FMC carrier SPEC
Commit 78dc3531 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

drv: rename spec driver to avoid conflicts 

We want to avoid conflict with the spec-sw driver
Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent bc7c3efe
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
distribution/Makefile
View file @ 78dc3531
TOP_DIR ?= ../ TOP_DIR ?= ../
DRIVER_NAME := spec DRIVER_NAME := spec-fmc-carrier
VERSION := $(shell git describe --abbrev=0) VERSION := $(shell git describe --abbrev=0)
DIR_NAME := $(DRIVER_NAME)-$(VERSION) DIR_NAME := $(DRIVER_NAME)-$(VERSION)
KEEP_TEMP ?= n KEEP_TEMP ?= n
......
kernel/Kbuild
View file @ 78dc3531
...@@ -27,12 +27,12 @@ KBUILD_EXTRA_SYMBOLS += $(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)/drivers/fpga/Module ...@@ -27,12 +27,12 @@ KBUILD_EXTRA_SYMBOLS += $(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)/drivers/fpga/Module
endif endif
KBUILD_EXTRA_SYMBOLS += $(FMC_ABS)/drivers/fmc/Module.symvers KBUILD_EXTRA_SYMBOLS += $(FMC_ABS)/drivers/fmc/Module.symvers
obj-m := spec.o obj-m := spec-fmc-carrier.o
spec-objs := spec-core.o spec-fmc-carrier-objs := spec-core.o
spec-objs += spec-fpga.o spec-fmc-carrier-objs += spec-fpga.o
spec-objs += spec-dbg.o spec-fmc-carrier-objs += spec-dbg.o
spec-objs += spec-fmc.o spec-fmc-carrier-objs += spec-fmc.o
spec-objs += spec-compat.o spec-fmc-carrier-objs += spec-compat.o
spec-objs += gn412x-gpio.o spec-fmc-carrier-objs += gn412x-gpio.o
spec-objs += spec-gpio.o spec-fmc-carrier-objs += spec-gpio.o
kernel/spec-core.c
View file @ 78dc3531
...@@ -227,7 +227,7 @@ static struct pci_driver spec_driver = { ...@@ -227,7 +227,7 @@ static struct pci_driver spec_driver = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.name = "spec", .name = "spec-fmc-carrier",
.probe = spec_probe, .probe = spec_probe,
.remove = spec_remove, .remove = spec_remove,
.id_table = spec_pci_tbl, .id_table = spec_pci_tbl,
...@@ -238,7 +238,7 @@ module_pci_driver(spec_driver); ...@@ -238,7 +238,7 @@ module_pci_driver(spec_driver);
MODULE_AUTHOR("Federico Vaga <federico.vaga@cern.ch>"); MODULE_AUTHOR("Federico Vaga <federico.vaga@cern.ch>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_VERSION(VERSION); MODULE_VERSION(VERSION);
MODULE_DESCRIPTION("spec driver"); MODULE_DESCRIPTION("Driver for the 'Simple PCIe FMC Carrier' a.k.a. SPEC");
MODULE_DEVICE_TABLE(pci, spec_pci_tbl); MODULE_DEVICE_TABLE(pci, spec_pci_tbl);
ADDITIONAL_VERSIONS; ADDITIONAL_VERSIONS;
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