diff options
| author | Florian Fainelli | 2019-03-18 10:31:24 -0700 |
|---|---|---|
| committer | Florian Fainelli | 2019-03-18 10:31:24 -0700 |
| commit | 4823a031f096d6d5fd16fccd8a3dd51b05a6becf (patch) | |
| tree | 6cd1ecc3300a60c03e971065bcbbf77164b514a9 /arch/arm64 | |
| parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
| parent | 7a9b6be9fe58194d9a349159176e8cc0d8f10ef8 (diff) | |
Merge tag 'tags/bcm2835-drivers-next-2019-03-12' into soc/fixes
This pull request brings in a build fix for arm64 with bcm2835
enabled, and fixes the driver in the presence of -EPROBE_DEFER.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm64')
| -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 70498a033cf5..b5ca9c50876d 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -27,6 +27,7 @@ config ARCH_BCM2835 bool "Broadcom BCM2835 family" select TIMER_OF select GPIOLIB + select MFD_CORE select PINCTRL select PINCTRL_BCM2835 select ARM_AMBA |