diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 20:55:14 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 20:55:15 +0100 |
| commit | 7cd6fa606241b765b49f74b996e55dfaa44a0a29 (patch) | |
| tree | 435a06b434e57b02aae10531e54a1fe30816c637 /arch/arm64 | |
| parent | 27262a754469d0c2d09592d0b4f8fa6ce513ca64 (diff) | |
| parent | feefd39ab6bb6a746364ef00c39cce2e33a0fde7 (diff) | |
| download | linux-7cd6fa606241b765b49f74b996e55dfaa44a0a29.tar.bz2 | |
Merge tag 'arm-soc/for-5.7/soc-arm64' of https://github.com/Broadcom/stblinux into arm/soc
This pull request contains Broadcom ARM64 SoCs changes for 5.7, please
pull the following:
- Geert drops the non-existent HAVE_ARM_ARCH_TIMER symbol select for
ARCH_BCM2835
* tag 'arm-soc/for-5.7/soc-arm64' of https://github.com/Broadcom/stblinux:
arm64: bcm2835: Drop select of nonexistent HAVE_ARM_ARCH_TIMER
Link: https://lore.kernel.org/r/20200311212012.9418-4-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index b2b504ea6fd6..ad4335122e70 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -39,7 +39,6 @@ config ARCH_BCM2835 select ARM_AMBA select ARM_GIC select ARM_TIMER_SP804 - select HAVE_ARM_ARCH_TIMER help This enables support for the Broadcom BCM2837 and BCM2711 SoC. These SoCs are used in the Raspberry Pi 3 and 4 devices. |