Skip to content

Commit

Permalink
Merge tag 'arm-soc/for-5.5/soc-fixes' of https://github.com/Broadcom/…
Browse files Browse the repository at this point in the history
…stblinux into arm/fixes

This pull request contains Broadcom ARM-based SoCs machine fixes for
5.5-rc1, please pull the following:

- H. Nikolaus adds a missing sentinel entry to the BCM2711 machine
  descriptor compatible array which would make multiplatform kernels fail
  to boot

* tag 'arm-soc/for-5.5/soc-fixes' of https://github.com/Broadcom/stblinux:
  ARM: bcm: Add missing sentinel to bcm2711_compat[]

Link: https://lore.kernel.org/r/20191216035701.15534-1-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
Olof Johansson committed Dec 16, 2019
2 parents c3e5ac0 + 59034b9 commit e3992af
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-bcm/bcm2711.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ static const char * const bcm2711_compat[] = {
#ifdef CONFIG_ARCH_MULTI_V7
"brcm,bcm2711",
#endif
NULL
};

DT_MACHINE_START(BCM2711, "BCM2711")
Expand Down

0 comments on commit e3992af

Please sign in to comment.