diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-01-18 10:45:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-03 15:07:08 -0800 |
| commit | bb10b5e76eac0a4ea6cd2350c8c9efdc620233ed (patch) | |
| tree | 99aa21d3dac0aa3e6f075f5a4f1a2da9d718c937 /scripts/Lindent | |
| parent | 7c3d1424dd42356a00e83b06c0a39629c4a7e5e3 (diff) | |
| download | talos-op-linux-bb10b5e76eac0a4ea6cd2350c8c9efdc620233ed.tar.gz talos-op-linux-bb10b5e76eac0a4ea6cd2350c8c9efdc620233ed.zip | |
ARM: debug-ll: fix BCM63xx entry for multiplatform
commit 6c54809977de3c9e2ef9e9934a2c6625f7e161e7 upstream.
During my randconfig build testing, I found that a kernel with
DEBUG_AT91_UART and ARCH_BCM_63XX fails to build:
arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror]
It turns out that the DEBUG_UART_BCM63XX option is enabled whenever
the ARCH_BCM_63XX is, and that breaks multiplatform kernels because
we then end up using the UART address from BCM63XX rather than the
one we actually configured (if any).
This changes the BCM63XX options to only have one Kconfig option,
and only enable that if the user explicitly turns it on.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: b51312bebfa4 ("ARM: BCM63XX: add low-level UART debug support")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/Lindent')
0 files changed, 0 insertions, 0 deletions
