summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/Makefile
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-04-04 23:10:34 +0200
committerKumar Gala <galak@kernel.crashing.org>2006-04-04 23:10:34 +0200
commit12df7556705aae97f24a397377e17898700d7192 (patch)
tree5adc6b1c2aa940263ee2e88fc6645918533da539 /drivers/infiniband/Makefile
parentpowerpc/ppc: export strncasecmp (diff)
parentLinux v2.6.17-rc1 (diff)
downloadlinux-12df7556705aae97f24a397377e17898700d7192.tar.xz
linux-12df7556705aae97f24a397377e17898700d7192.zip
Merge branch 'master'
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 a43fb34cca94..eea27322a22d 100644
--- a/drivers/infiniband/Makefile
+++ b/drivers/infiniband/Makefile
@@ -1,4 +1,5 @@
obj-$(CONFIG_INFINIBAND) += core/
obj-$(CONFIG_INFINIBAND_MTHCA) += hw/mthca/
+obj-$(CONFIG_IPATH_CORE) += hw/ipath/
obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/
obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/