Skip to contentSkip to conversation

please pull infiniband.git (again)

GIT PULL Roland Dreier 1 participant 1 message Nov 20, 2006 InfiniBand

lore
Share & tools
lore
#0 lore raw

Linus, please pull from

master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus

This tree is also available from kernel.org mirrors at:

git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus

Sorry for the multiple pull requests today, but this came in just after I prepared my previous pull. This adds one more tiny Kconfig fix:

Bryan O'Sullivan (1):
IB/ipath: Depend on CONFIG_NET

 drivers/infiniband/hw/ipath/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 3f5a6ca31c334011fd929501a078424c0d3f71be

Author: Bryan O'Sullivan <[email protected]>
Date:   Mon Nov 20 10:54:34 2006 -0800

IB/ipath: Depend on CONFIG_NET

ipath uses skb functions and won't build without CONFIG_NET.

Spotted by Randy Dunlap.

drivers/infiniband/hw/ipath/Kconfig +1 -1
index 5ca471a..90c1454 100644
@@ -1,6 +1,6 @@
 config INFINIBAND_IPATH
 	tristate "QLogic InfiniPath Driver"
-	depends on (PCI_MSI || HT_IRQ) && 64BIT && INFINIBAND
+	depends on (PCI_MSI || HT_IRQ) && 64BIT && INFINIBAND && NET
 	---help---
 	This is a driver for QLogic InfiniPath host channel adapters,
 	including InfiniBand verbs support.  This driver allows these