diff options
author | Jan Engelhardt <jengelh@linux01.gwdg.de> | 2007-07-16 02:39:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:40 -0400 |
commit | 751cb5e56436f6c889d9acbd3d4464224e49965d (patch) | |
tree | 97a26f7cc8b307c60b0123108aa25ff59a603940 | |
parent | f5920969fb9e29c9d60568864d0a56fe85e8f4b6 (diff) |
Use menuconfig objects II - EDAC
Change Kconfig objects from "menu, config" into "menuconfig" so
that the user can disable the whole feature without having to
enter the menu first.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/edac/Kconfig | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 807c402df049..debf1d8e8b41 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig | |||
@@ -6,11 +6,9 @@ | |||
6 | # $Id: Kconfig,v 1.4.2.7 2005/07/08 22:05:38 dsp_llnl Exp $ | 6 | # $Id: Kconfig,v 1.4.2.7 2005/07/08 22:05:38 dsp_llnl Exp $ |
7 | # | 7 | # |
8 | 8 | ||
9 | menu 'EDAC - error detection and reporting (RAS) (EXPERIMENTAL)' | 9 | menuconfig EDAC |
10 | tristate "EDAC - error detection and reporting (EXPERIMENTAL)" | ||
10 | depends on HAS_IOMEM | 11 | depends on HAS_IOMEM |
11 | |||
12 | config EDAC | ||
13 | tristate "EDAC core system error reporting (EXPERIMENTAL)" | ||
14 | depends on X86 && EXPERIMENTAL | 12 | depends on X86 && EXPERIMENTAL |
15 | help | 13 | help |
16 | EDAC is designed to report errors in the core system. | 14 | EDAC is designed to report errors in the core system. |
@@ -30,13 +28,12 @@ config EDAC | |||
30 | There is also a mailing list for the EDAC project, which can | 28 | There is also a mailing list for the EDAC project, which can |
31 | be found via the sourceforge page. | 29 | be found via the sourceforge page. |
32 | 30 | ||
31 | if EDAC | ||
33 | 32 | ||
34 | comment "Reporting subsystems" | 33 | comment "Reporting subsystems" |
35 | depends on EDAC | ||
36 | 34 | ||
37 | config EDAC_DEBUG | 35 | config EDAC_DEBUG |
38 | bool "Debugging" | 36 | bool "Debugging" |
39 | depends on EDAC | ||
40 | help | 37 | help |
41 | This turns on debugging information for the entire EDAC | 38 | This turns on debugging information for the entire EDAC |
42 | sub-system. You can insert module with "debug_level=x", current | 39 | sub-system. You can insert module with "debug_level=x", current |
@@ -45,7 +42,6 @@ config EDAC_DEBUG | |||
45 | 42 | ||
46 | config EDAC_MM_EDAC | 43 | config EDAC_MM_EDAC |
47 | tristate "Main Memory EDAC (Error Detection And Correction) reporting" | 44 | tristate "Main Memory EDAC (Error Detection And Correction) reporting" |
48 | depends on EDAC | ||
49 | default y | 45 | default y |
50 | help | 46 | help |
51 | Some systems are able to detect and correct errors in main | 47 | Some systems are able to detect and correct errors in main |
@@ -100,15 +96,13 @@ config EDAC_R82600 | |||
100 | 96 | ||
101 | choice | 97 | choice |
102 | prompt "Error detecting method" | 98 | prompt "Error detecting method" |
103 | depends on EDAC | ||
104 | default EDAC_POLL | 99 | default EDAC_POLL |
105 | 100 | ||
106 | config EDAC_POLL | 101 | config EDAC_POLL |
107 | bool "Poll for errors" | 102 | bool "Poll for errors" |
108 | depends on EDAC | ||
109 | help | 103 | help |
110 | Poll the chipset periodically to detect errors. | 104 | Poll the chipset periodically to detect errors. |
111 | 105 | ||
112 | endchoice | 106 | endchoice |
113 | 107 | ||
114 | endmenu | 108 | endif # EDAC |