Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / drivers / infiniband / hw / ipath / Makefile

diff --git a/drivers/infiniband/hw/ipath/Makefile b/drivers/infiniband/hw/ipath/Makefile
index fe67388..fa3df82 100644 (file)
--- a/drivers/infiniband/hw/ipath/Makefile
+++ b/drivers/infiniband/hw/ipath/Makefile
@@ -20,17 +20,18 @@ ib_ipath-y := \
        ipath_qp.o \
        ipath_rc.o \
        ipath_ruc.o \
+       ipath_sdma.o \
        ipath_srq.o \
        ipath_stats.o \
        ipath_sysfs.o \
        ipath_uc.o \
        ipath_ud.o \
        ipath_user_pages.o \
+       ipath_user_sdma.o \
        ipath_verbs_mcast.o \
        ipath_verbs.o
 
 ib_ipath-$(CONFIG_HT_IRQ) += ipath_iba6110.o
-ib_ipath-$(CONFIG_PCI_MSI) += ipath_iba6120.o
 
 ib_ipath-$(CONFIG_X86_64) += ipath_wc_x86_64.o
 ib_ipath-$(CONFIG_PPC64) += ipath_wc_ppc64.o