summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/Makefile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-05-31 05:59:19 +0200
committerPaul Mundt <lethal@linux-sh.org>2010-05-31 05:59:19 +0200
commit8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch)
tree266c42b6687e68e4febb72d8c031e5facd899a1c /drivers/infiniband/Makefile
parentsh: remove duplicated #include (diff)
parentLinux 2.6.35-rc1 (diff)
downloadlinux-8fa76f7e61ef4e5bc97207143ea4e198b22487bc.tar.xz
linux-8fa76f7e61ef4e5bc97207143ea4e198b22487bc.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/infiniband/Makefile')
-rw-r--r--drivers/infiniband/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile
index 0c4e589d746e..9cc7a47d3e67 100644
--- a/drivers/infiniband/Makefile
+++ b/drivers/infiniband/Makefile
@@ -1,6 +1,7 @@
obj-$(CONFIG_INFINIBAND) += core/
obj-$(CONFIG_INFINIBAND_MTHCA) += hw/mthca/
obj-$(CONFIG_INFINIBAND_IPATH) += hw/ipath/
+obj-$(CONFIG_INFINIBAND_QIB) += hw/qib/
obj-$(CONFIG_INFINIBAND_EHCA) += hw/ehca/
obj-$(CONFIG_INFINIBAND_AMSO1100) += hw/amso1100/
obj-$(CONFIG_INFINIBAND_CXGB3) += hw/cxgb3/