diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 14:45:28 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 14:45:28 +0100 |
commit | 3b325a494ba8835b9dc85c7dcc23b887c7deb119 (patch) | |
tree | 5e94675e5407066a286201121c62be656fbc8cf2 /arch/arm/Kconfig.debug | |
parent | Merge branch 'bcm/cleanup' into next/soc (diff) | |
parent | ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILE (diff) | |
download | linux-3b325a494ba8835b9dc85c7dcc23b887c7deb119.tar.xz linux-3b325a494ba8835b9dc85c7dcc23b887c7deb119.zip |
Merge tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm into next/soc
Merge "ARM: mach-bcm: soc updates for 3.15 - part 2" from Matt Porter:
- Add bcm21664 support
- Use Kona Debug UART only on ARCH_BCM_MOBILE
* tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm:
ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILE
ARM: bcm21664: Add board support.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig.debug')
-rw-r--r-- | arch/arm/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index f4b656f789b3..37fa20a18531 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -113,7 +113,7 @@ choice config DEBUG_BCM_KONA_UART bool "Kernel low-level debugging messages via BCM KONA UART" - depends on ARCH_BCM + depends on ARCH_BCM_MOBILE select DEBUG_UART_8250 help Say Y here if you want kernel low-level debugging support |