diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
| commit | 4a3381feb823e06c8e2da7e283c17b0b6fdbddcf (patch) | |
| tree | e1bef4c3db854bb10fd13dc67415d77b5d999533 /drivers/s390/net/Kconfig | |
| parent | fea63e38013ec628ab3f7fddc4c2148064b7910a (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/s390/net/Kconfig')
| -rw-r--r-- | drivers/s390/net/Kconfig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig index 548854754921..1a93fa684e9f 100644 --- a/drivers/s390/net/Kconfig +++ b/drivers/s390/net/Kconfig | |||
| @@ -92,15 +92,6 @@ config QETH_VLAN | |||
| 92 | If CONFIG_QETH is switched on, this option will include IEEE | 92 | If CONFIG_QETH is switched on, this option will include IEEE |
| 93 | 802.1q VLAN support in the qeth device driver. | 93 | 802.1q VLAN support in the qeth device driver. |
| 94 | 94 | ||
| 95 | config QETH_PERF_STATS | ||
| 96 | bool "Performance statistics in /proc" | ||
| 97 | depends on QETH | ||
| 98 | help | ||
| 99 | When switched on, this option will add a file in the proc-fs | ||
| 100 | (/proc/qeth_perf_stats) containing performance statistics. It | ||
| 101 | may slightly impact performance, so this is only recommended for | ||
| 102 | internal tuning of the device driver. | ||
| 103 | |||
| 104 | config CCWGROUP | 95 | config CCWGROUP |
| 105 | tristate | 96 | tristate |
| 106 | default (LCS || CTC || QETH) | 97 | default (LCS || CTC || QETH) |