diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-18 10:24:01 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-18 10:24:01 +0300 |
| commit | 02386c356af0ce5bbee11ed9b23c312ca60298f0 (patch) | |
| tree | 24d6816d783975cbc237af3a53c34f44fda03de2 /drivers/clk/h8300/clk-h8s2678.c | |
| parent | d71b0ad8d30922ccdd0705318237e6890b4ec1b6 (diff) | |
| parent | f73e22ab450140830005581c2c7ec389791a1b8d (diff) | |
| download | linux-02386c356af0ce5bbee11ed9b23c312ca60298f0.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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); |