]> err.no Git - linux-2.6/commitdiff
IB/ipath: Build IBA7220 code unconditionally
authorRoland Dreier <rolandd@cisco.com>
Tue, 22 Apr 2008 01:19:14 +0000 (18:19 -0700)
committerRoland Dreier <rolandd@cisco.com>
Tue, 22 Apr 2008 01:19:14 +0000 (18:19 -0700)
The new IBA7220 code added a call to ipath_init_iba7220_funcs() that
is compiled unconditionally, but only built the IBA7220 code if
PCI_MSI is enabled.  Fix this by building the IBA7220 file
unconditonally.

This fixes build breakage when PCI_MSI=n, HT_IRQ=y and
INFINIBAND_IPATH=y reported by Ingo Molnar <mingo@elte.hu>:

 drivers/built-in.o: In function `ipath_init_one':
 ipath_driver.c:(.devinit.text+0x1e5bc): undefined reference to `ipath_init_iba7220_funcs'

Signed-off-by: Roland Dreier <rolandd@cisco.com>
drivers/infiniband/hw/ipath/Makefile

index 75a6c91944c4b7d8ccfd6bc5eb8af815fdba99d7..bf945006198645eeff5e75f5ffa8b6f004f895ba 100644 (file)
@@ -29,11 +29,13 @@ ib_ipath-y := \
        ipath_user_pages.o \
        ipath_user_sdma.o \
        ipath_verbs_mcast.o \
-       ipath_verbs.o
+       ipath_verbs.o \
+       ipath_iba7220.o \
+       ipath_sd7220.o \
+       ipath_sd7220_img.o
 
 ib_ipath-$(CONFIG_HT_IRQ) += ipath_iba6110.o
 ib_ipath-$(CONFIG_PCI_MSI) += ipath_iba6120.o
-ib_ipath-$(CONFIG_PCI_MSI) += ipath_iba7220.o ipath_sd7220.o ipath_sd7220_img.o
 
 ib_ipath-$(CONFIG_X86_64) += ipath_wc_x86_64.o
 ib_ipath-$(CONFIG_PPC64) += ipath_wc_ppc64.o