]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e98c67 7a9b6be)
Merge tag 'tags/bcm2835-drivers-next-2019-03-12' into soc/fixes
authorFlorian Fainelli <f.fainelli@gmail.com>
Mon, 18 Mar 2019 17:31:24 +0000 (10:31 -0700)
committerFlorian Fainelli <f.fainelli@gmail.com>
Mon, 18 Mar 2019 17:31:24 +0000 (10:31 -0700)
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>
1  2 
arch/arm64/Kconfig.platforms patch | diff1 | diff2 | blob | history
drivers/soc/bcm/bcm2835-power.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/Kconfig.platforms
Simple merge
diff --cc drivers/soc/bcm/bcm2835-power.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.