Merge /spare/repo/linux-2.6/

[linux-2.6-omap-h63xx.git] / drivers / infiniband / core / Makefile

diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
index 216cb281abdd85bbe04b95a0d9b1e1d1a943afc5..678a7e097f329de2e3e6b926443807babf2ccdf4 100644 (file)
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@ -1,7 +1,5 @@
-EXTRA_CFLAGS += -Idrivers/infiniband/include
-
 obj-$(CONFIG_INFINIBAND) +=            ib_core.o ib_mad.o ib_sa.o \
-                                       ib_cm.o ib_umad.o
+                                       ib_cm.o ib_umad.o ib_ucm.o
 obj-$(CONFIG_INFINIBAND_USER_VERBS) += ib_uverbs.o
 
 ib_core-y :=                   packer.o ud_header.o verbs.o sysfs.o \
@@ -15,4 +13,6 @@ ib_cm-y :=                    cm.o
 
 ib_umad-y :=                   user_mad.o
 
+ib_ucm-y :=                    ucm.o
+
 ib_uverbs-y :=                 uverbs_main.o uverbs_cmd.o uverbs_mem.o