diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-03 17:22:44 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-03 17:22:51 (GMT) |
commit | 89cab4624a8c0ed81a1b74b6f8c884641cac5b9d (patch) | |
tree | 3a2f1ae599ee4bae60ccf11cc154d73c210c6388 /arch/arm64/Kconfig.debug | |
parent | 2e1cc199fc8666ac5fda200e8a99f1e4dea07175 (diff) | |
parent | c6f9b1eb0e5df468891eff17f981b76c86f95f3a (diff) | |
download | linux-fsl-qoriq-89cab4624a8c0ed81a1b74b6f8c884641cac5b9d.tar.xz |
ASoC: core: Merge Samsung fixes to avoid trivial context conflict
Merge branch 'fix/samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-component to resolve trivial conflict
Conflicts:
sound/soc/samsung/i2s.c
Diffstat (limited to 'arch/arm64/Kconfig.debug')
-rw-r--r-- | arch/arm64/Kconfig.debug | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug index 5149343..1a6bfe9 100644 --- a/arch/arm64/Kconfig.debug +++ b/arch/arm64/Kconfig.debug @@ -6,17 +6,6 @@ config FRAME_POINTER bool default y -config DEBUG_ERRORS - bool "Verbose kernel error messages" - depends on DEBUG_KERNEL - help - This option controls verbose debugging information which can be - printed when the kernel detects an internal error. This debugging - information is useful to kernel hackers when tracking down problems, - but mostly meaningless to other people. It's safe to say Y unless - you are concerned with the code size or don't want to see these - messages. - config DEBUG_STACK_USAGE bool "Enable stack utilization instrumentation" depends on DEBUG_KERNEL |