diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 11:16:55 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 11:16:55 +1000 |
| commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
| tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /drivers/net/Kconfig | |
| parent | 492b057c426e4aa747484958e18e9da29003985d (diff) | |
| parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 01f282cd098..892a9e4e275 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2206,7 +2206,7 @@ config SKGE_DEBUG depends on SKGE && DEBUG_FS help This option adds the ability to dump driver state for debugging. - The file debugfs/skge/ethX displays the state of the internal + The file /sys/kernel/debug/skge/ethX displays the state of the internal transmit and receive rings. If unsure, say N. @@ -2232,7 +2232,7 @@ config SKY2_DEBUG depends on SKY2 && DEBUG_FS help This option adds the ability to dump driver state for debugging. - The file debugfs/sky2/ethX displays the state of the internal + The file /sys/kernel/debug/sky2/ethX displays the state of the internal transmit and receive rings. If unsure, say N. @@ -2272,8 +2272,9 @@ config BNX2 config CNIC tristate "Broadcom CNIC support" - depends on BNX2 - depends on UIO + depends on PCI + select BNX2 + select UIO help This driver supports offload features of Broadcom NetXtremeII gigabit Ethernet cards. |