diff options
| author | Linus Torvalds | 2022-10-14 13:44:53 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2022-10-14 13:44:53 -0700 |
| commit | ca1aaf993755d21b8a0060c3bf0f77e303a7bf21 (patch) | |
| tree | e183a4f7bec597b9597f55173edd5661dbcdd553 /drivers | |
| parent | dca45efbe3c870a4ad2107fe625109b3765c0fea (diff) | |
| parent | bd60aafce5e1943fd395b8bf726e9824fa621eca (diff) | |
Merge tag 'arm-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann:
"These are three fixes for build warnings that came in during the merge
window"
* tag 'arm-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: mmp: Make some symbols static
ARM: spear6xx: Staticize few definitions
clk: spear: Move prototype to accessible header
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/spear/spear3xx_clock.c | 1 | ||||
| -rw-r--r-- | drivers/clk/spear/spear6xx_clock.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/spear/spear3xx_clock.c b/drivers/clk/spear/spear3xx_clock.c index 41717ff707f6..ba8791303156 100644 --- a/drivers/clk/spear/spear3xx_clock.c +++ b/drivers/clk/spear/spear3xx_clock.c @@ -8,6 +8,7 @@ #include <linux/clk.h> #include <linux/clkdev.h> +#include <linux/clk/spear.h> #include <linux/err.h> #include <linux/io.h> #include <linux/of_platform.h> diff --git a/drivers/clk/spear/spear6xx_clock.c b/drivers/clk/spear/spear6xx_clock.c index 490701ac9e93..c192a9141b86 100644 --- a/drivers/clk/spear/spear6xx_clock.c +++ b/drivers/clk/spear/spear6xx_clock.c @@ -7,6 +7,7 @@ */ #include <linux/clkdev.h> +#include <linux/clk/spear.h> #include <linux/io.h> #include <linux/spinlock_types.h> #include "clk.h" |