diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 21:43:21 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 21:43:21 -0700 |
| commit | 9c6641224bdc2957f1d4ef692f027ff5e0fcc63b (patch) | |
| tree | 589c55d8a24b79a5cfd2cb3379d1ce0cac9c7464 /lib | |
| parent | c9134a33b3936ca9cae8bdc6dccd77e9c294f0ef (diff) | |
| parent | 5275e74ae5e7e92b05bd1361e2573bb38d381358 (diff) | |
Merge commit '5275e74' into after-upstream-android
Conflicts:
arch/arm/common/Kconfig
arch/arm/mm/Makefile
arch/arm/mm/cache-l2x0.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/core/core.c
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 8745ac7d1f75..fcd954d9b7f0 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -671,8 +671,9 @@ config DEBUG_LOCKING_API_SELFTESTS mutexes and rwsems. config STACKTRACE - bool + bool "Stacktrace" depends on STACKTRACE_SUPPORT + default y config DEBUG_STACK_USAGE bool "Stack utilization instrumentation" |