Merge branch 'devel'

[linux-2.6] / drivers / infiniband / hw / mthca / Kconfig

diff --git a/drivers/infiniband/hw/mthca/Kconfig b/drivers/infiniband/hw/mthca/Kconfig
index e88be85b3d5cac6724e99532e0589ac0c391a0cd..03efc074967e2b5344f18acc25f23d2ecf14b2c0 100644 (file)
--- a/drivers/infiniband/hw/mthca/Kconfig
+++ b/drivers/infiniband/hw/mthca/Kconfig
@@ -1,16 +1,17 @@
 config INFINIBAND_MTHCA
        tristate "Mellanox HCA support"
-       depends on PCI && INFINIBAND
+       depends on PCI
        ---help---
          This is a low-level driver for Mellanox InfiniHost host
          channel adapters (HCAs), including the MT23108 PCI-X HCA
          ("Tavor") and the MT25208 PCI Express HCA ("Arbel").
 
 config INFINIBAND_MTHCA_DEBUG
-       bool "Verbose debugging output"
+       bool "Verbose debugging output" if EMBEDDED
        depends on INFINIBAND_MTHCA
-       default n
+       default y
        ---help---
-         This option causes the mthca driver produce a bunch of debug
-         messages.  Select this is you are developing the driver or
-         trying to diagnose a problem.
+         This option causes debugging code to be compiled into the
+         mthca 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).