diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /init/Kconfig | |
| parent | 65c0cfafce9575319fb6f70080fbe226e5617e3b (diff) | |
| parent | b2722b1c3a893ec6021508da15b32282ec79f4da (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 9e03ef8b311e..39923ccc287b 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1098,6 +1098,16 @@ config SLOW_WORK | |||
| 1098 | 1098 | ||
| 1099 | See Documentation/slow-work.txt. | 1099 | See Documentation/slow-work.txt. |
| 1100 | 1100 | ||
| 1101 | config SLOW_WORK_DEBUG | ||
| 1102 | bool "Slow work debugging through debugfs" | ||
| 1103 | default n | ||
| 1104 | depends on SLOW_WORK && DEBUG_FS | ||
| 1105 | help | ||
| 1106 | Display the contents of the slow work run queue through debugfs, | ||
| 1107 | including items currently executing. | ||
| 1108 | |||
| 1109 | See Documentation/slow-work.txt. | ||
| 1110 | |||
| 1101 | endmenu # General setup | 1111 | endmenu # General setup |
| 1102 | 1112 | ||
| 1103 | config HAVE_GENERIC_DMA_COHERENT | 1113 | config HAVE_GENERIC_DMA_COHERENT |