diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /lib/Kconfig.debug | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'lib/Kconfig.debug')
-rw-r--r-- | lib/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index a79c4d0407ab..d8ed25cdbb29 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -105,7 +105,7 @@ config DEBUG_SECTION_MISMATCH | |||
105 | bool "Enable full Section mismatch analysis" | 105 | bool "Enable full Section mismatch analysis" |
106 | depends on UNDEFINED | 106 | depends on UNDEFINED |
107 | # This option is on purpose disabled for now. | 107 | # This option is on purpose disabled for now. |
108 | # It will be enabled when we are down to a resonable number | 108 | # It will be enabled when we are down to a reasonable number |
109 | # of section mismatch warnings (< 10 for an allyesconfig build) | 109 | # of section mismatch warnings (< 10 for an allyesconfig build) |
110 | help | 110 | help |
111 | The section mismatch analysis checks if there are illegal | 111 | The section mismatch analysis checks if there are illegal |