summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Ruprecht <rupran@einserver.de>2014-08-10 21:40:48 +0200
committerDavid S. Miller <davem@davemloft.net>2014-08-11 21:44:35 +0200
commit7a6cdb8cfebf16907926e78a30f493fa587695e6 (patch)
tree19f100bc6292ecec2128b41ec3596e63f7da6997
parentwan: wanxl: Remove typedefs from struct names (diff)
downloadlinux-7a6cdb8cfebf16907926e78a30f493fa587695e6.tar.xz
linux-7a6cdb8cfebf16907926e78a30f493fa587695e6.zip
net: ethernet: qlogic: qlcnic: Remove duplicate object file from Makefile
In the Makefile, qlcnic_minidump.o is included twice in the list of object files linked into qlcnic.o. This change removes the superfluous include. Signed-off-by: Andreas Ruprecht <rupran@einserver.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/Makefile b/drivers/net/ethernet/qlogic/qlcnic/Makefile
index a848d2979722..3c2c2c7c1559 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/Makefile
+++ b/drivers/net/ethernet/qlogic/qlcnic/Makefile
@@ -8,7 +8,7 @@ qlcnic-y := qlcnic_hw.o qlcnic_main.o qlcnic_init.o \
qlcnic_ethtool.o qlcnic_ctx.o qlcnic_io.o \
qlcnic_sysfs.o qlcnic_minidump.o qlcnic_83xx_hw.o \
qlcnic_83xx_init.o qlcnic_83xx_vnic.o \
- qlcnic_minidump.o qlcnic_sriov_common.o
+ qlcnic_sriov_common.o
qlcnic-$(CONFIG_QLCNIC_SRIOV) += qlcnic_sriov_pf.o