From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 10 May 2007 02:40:09 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v2.6.22-rc1~130
X-Git-Url: http://git.rot13.org/?p=powerpc.git;a=commitdiff_plain;h=de5603748af8bf7deac403e6ba92887f8d18e812;hp=-c

Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mlx4: Add a driver Mellanox ConnectX InfiniBand adapters
  IB: Put rlimit accounting struct in struct ib_umem
  IB/uverbs: Export ib_umem_get()/ib_umem_release() to modules
---

de5603748af8bf7deac403e6ba92887f8d18e812
diff --combined drivers/net/Kconfig
index d9842d8544,6db12d0265..fa489b10c3
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -2493,14 -2493,26 +2493,28 @@@ config PASEMI_MA
  	  This driver supports the on-chip 1/10Gbit Ethernet controller on
  	  PA Semi's PWRficient line of chips.
  
+ config MLX4_CORE
+ 	tristate
+ 	depends on PCI
+ 	default n
+ 
+ config MLX4_DEBUG
+ 	bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED)
+ 	default y
+ 	---help---
+ 	  This option causes debugging code to be compiled into the
+ 	  mlx4_core driver.  The output can be turned on via the
+ 	  debug_level module parameter (which can also be set after
+ 	  the driver is loaded through sysfs).
+ 
  endmenu
  
  source "drivers/net/tokenring/Kconfig"
  
  source "drivers/net/wireless/Kconfig"
  
 +source "drivers/net/usb/Kconfig"
 +
  source "drivers/net/pcmcia/Kconfig"
  
  source "drivers/net/wan/Kconfig"
diff --combined drivers/net/Makefile
index c5d8423573,7faeeeabc8..a77affa4f6
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -197,6 -197,7 +197,7 @@@ obj-$(CONFIG_SMC911X) += smc911x.
  obj-$(CONFIG_DM9000) += dm9000.o
  obj-$(CONFIG_FEC_8XX) += fec_8xx/
  obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
+ obj-$(CONFIG_MLX4_CORE) += mlx4/
  
  obj-$(CONFIG_MACB) += macb.o
  
@@@ -206,14 -207,6 +207,14 @@@ obj-$(CONFIG_TR) += tokenring
  obj-$(CONFIG_WAN) += wan/
  obj-$(CONFIG_ARCNET) += arcnet/
  obj-$(CONFIG_NET_PCMCIA) += pcmcia/
 +
 +obj-$(CONFIG_USB_CATC)          += usb/
 +obj-$(CONFIG_USB_KAWETH)        += usb/
 +obj-$(CONFIG_USB_PEGASUS)       += usb/
 +obj-$(CONFIG_USB_RTL8150)       += usb/
 +obj-$(CONFIG_USB_USBNET)        += usb/
 +obj-$(CONFIG_USB_ZD1201)        += usb/
 +
  obj-y += wireless/
  obj-$(CONFIG_NET_TULIP) += tulip/
  obj-$(CONFIG_HAMRADIO) += hamradio/