diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-14 16:58:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-14 16:58:35 -0700 |
| commit | d25ed277fbd4c20247286fda2014ae6a2b88316b (patch) | |
| tree | ee90f683723a6b22b168775e7f0b0294e77ec66b /drivers/clk/h8300/clk-h8s2678.c | |
| parent | 9c488de24f7264f08d341024bffdd637b4d04c96 (diff) | |
| parent | 3bba75a2ec32bd5fa7024a4de3b8cf9ee113a76a (diff) | |
| download | blackbird-obmc-linux-d25ed277fbd4c20247286fda2014ae6a2b88316b.tar.gz blackbird-obmc-linux-d25ed277fbd4c20247286fda2014ae6a2b88316b.zip | |
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd:
"A couple build fixes for drivers introduced in the merge window and a
handful of patches to add more critical clocks on rockchip SoCs that
are affected by newly introduced gpio clock handling"
* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: rockchip: Add pclk_peri to critical clocks on RK3066/RK3188
clk: rockchip: add pclk_cpu to the list of rk3188 critical clocks
clk: rockchip: handle critical clocks after registering all clocks
clk: Hi6220: separately build stub clock driver
clk: h8s2678: Fix compile error
Diffstat (limited to 'drivers/clk/h8300/clk-h8s2678.c')
| -rw-r--r-- | drivers/clk/h8300/clk-h8s2678.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/h8300/clk-h8s2678.c b/drivers/clk/h8300/clk-h8s2678.c index 2a38eb4a2552..6cf38dc1c929 100644 --- a/drivers/clk/h8300/clk-h8s2678.c +++ b/drivers/clk/h8300/clk-h8s2678.c @@ -8,6 +8,7 @@ #include <linux/err.h> #include <linux/device.h> #include <linux/of_address.h> +#include <linux/slab.h> static DEFINE_SPINLOCK(clklock); |
