diff options
author | Mark Brown <broonie@kernel.org> | 2020-12-04 20:39:45 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-12-04 20:39:45 +0000 |
commit | 4ecc08b2f51d874f35185724eda769492b60a18d (patch) | |
tree | f4d9e97304e9ff423fd4efa5193a1b94ebfc5912 /arch/arm64/Kconfig.platforms | |
parent | 0b3355b070434f9901f641aac9000df93e2c96ad (diff) | |
parent | 0d2bf11a6b3e275a526b8d42d8d4a3a6067cf953 (diff) |
Merge tag 'auxbus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into asoc-5.11
Auxiliary Bus support tag for 5.11-rc1
This is a signed tag for other subsystems to be able to pull in the
auxiliary bus support into their trees for the 5.11-rc1 merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
-rw-r--r-- | arch/arm64/Kconfig.platforms | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 6f2494dd6d60..5c4ac1c9f4e0 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -54,6 +54,7 @@ config ARCH_BCM_IPROC config ARCH_BERLIN bool "Marvell Berlin SoC Family" select DW_APB_ICTL + select DW_APB_TIMER_OF select GPIOLIB select PINCTRL help |