Commit 4551a0da authored by Alessandro Rubini's avatar Alessandro Rubini

backport: always build wr-nic, now that we fixed issues

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 03c83c39
...@@ -12,15 +12,8 @@ ccflags-y += -I$M/include -I$(FMC_DRV)/include ...@@ -12,15 +12,8 @@ ccflags-y += -I$M/include -I$(FMC_DRV)/include
ccflags-y += $(WR_NIC_CFLAGS) ccflags-y += $(WR_NIC_CFLAGS)
ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\" ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\"
# this is a bad hack. Sometimes we are a submodule, and wr-nic can
# only compile with recent versions, so let the caller disable it
# FIXME: this is incorrect if we get copied to the kernel proper.
CONFIG_WR_NIC ?= n
# This is the backport branch, so fix it straight ahead: no wr-nic here.
obj-m += spec.o obj-m += spec.o
obj-$(CONFIG_WR_NIC) += wr-nic.o obj-m += wr-nic.o
spec-y = spec-pci.o spec-y = spec-pci.o
spec-y += spec-fmc.o spec-y += spec-fmc.o
......
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