Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 00:00:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into next/soc

Browse Source 
Merge "the second part of the Broadcom ARM-based SoC changes" from Florian Fainelli:

- Florian updates the DEBUG_UART_BCM5301X entry to cover both NS and NSP SoCs
  since they both have the same location

* tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux:
  ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
This commit is contained in:
Arnd Bergmann 2016-07-07 15:33:54 +02:00
commit 147de9757d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/Kconfig.debug
View File

@ -156,8 +156,8 @@ choice
select DEBUG_UART_PL01X select DEBUG_UART_PL01X
config DEBUG_BCM_5301X config DEBUG_BCM_5301X
bool "Kernel low-level debugging on BCM5301X UART1" bool "Kernel low-level debugging on BCM5301X/NSP UART1"
depends on ARCH_BCM_5301X depends on ARCH_BCM_5301X || ARCH_BCM_NSP
select DEBUG_UART_8250 select DEBUG_UART_8250
config DEBUG_BCM_KONA_UART config DEBUG_BCM_KONA_UART