git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
[sfrench/cifs-2.6.git]
/
drivers
/
infiniband
/
hw
/
Makefile
diff --git
a/drivers/infiniband/hw/Makefile
b/drivers/infiniband/hw/Makefile
index 21fe401ff178b96ba1c9c7a52c31e03d09505c3e..e7a5ed9f6f3fbbe6f3bc146469e3a00d0729b04f 100644
(file)
--- a/
drivers/infiniband/hw/Makefile
+++ b/
drivers/infiniband/hw/Makefile
@@
-10,3
+10,4
@@
obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma/
obj-$(CONFIG_INFINIBAND_USNIC) += usnic/
obj-$(CONFIG_INFINIBAND_HFI1) += hfi1/
obj-$(CONFIG_INFINIBAND_HNS) += hns/
+obj-$(CONFIG_INFINIBAND_QEDR) += qedr/