projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
qlogic
/
qede
/
Makefile
diff --git
a/drivers/net/ethernet/qlogic/qede/Makefile
b/drivers/net/ethernet/qlogic/qede/Makefile
index
28dc589
..
048a230
100644
(file)
--- a/
drivers/net/ethernet/qlogic/qede/Makefile
+++ b/
drivers/net/ethernet/qlogic/qede/Makefile
@@
-2,4
+2,4
@@
obj-$(CONFIG_QEDE) := qede.o
qede-y := qede_main.o qede_ethtool.o
qede-$(CONFIG_DCB) += qede_dcbnl.o
-qede-$(CONFIG_
INFINIBAND_QEDR
) += qede_roce.o
+qede-$(CONFIG_
QED_RDMA
) += qede_roce.o