diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 19:40:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 19:40:09 -0700 |
commit | de5603748af8bf7deac403e6ba92887f8d18e812 (patch) | |
tree | fd93862c70ec0eeba5fe340d7519ab33a9cb1dff /drivers/net/Kconfig | |
parent | b5f0adbcc4f16e378882d8f68fe3111df04911be (diff) | |
parent | 225c7b1feef1b41170f7037a5b10a65cd8a42c54 (diff) |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/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
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d9842d8544d..fa489b10c38 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2493,6 +2493,20 @@ config PASEMI_MAC 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" |