--- zzzz-none-000/linux-2.6.19.2/drivers/infiniband/hw/ipath/Makefile	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/infiniband/hw/ipath/Makefile	2007-01-11 07:38:19.000000000 +0000
@@ -10,6 +10,8 @@
 	ipath_eeprom.o \
 	ipath_file_ops.o \
 	ipath_fs.o \
+	ipath_iba6110.o \
+	ipath_iba6120.o \
 	ipath_init_chip.o \
 	ipath_intr.o \
 	ipath_keys.o \
@@ -29,8 +31,5 @@
 	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