diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-03 23:45:16 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-03 23:45:16 +0100 |
| commit | 84a73014d86fd660822a20c032625e3afe99ca58 (patch) | |
| tree | 9e42a2d3c40730947ae18363d00e8a0ee2743792 /drivers/clk/samsung/clk-exynos5420.c | |
| parent | Input: alps - only the Dell Latitude D420/430/620/630 have separate stick but... (diff) | |
| parent | Input: evdev - fix bug in checking duplicate clock change request (diff) | |
| download | linux-84a73014d86fd660822a20c032625e3afe99ca58.tar.xz linux-84a73014d86fd660822a20c032625e3afe99ca58.zip | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.3 merge window.
Diffstat (limited to 'drivers/clk/samsung/clk-exynos5420.c')
| -rw-r--r-- | drivers/clk/samsung/clk-exynos5420.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c index a1d731ca8f48..389af3c15ec4 100644 --- a/drivers/clk/samsung/clk-exynos5420.c +++ b/drivers/clk/samsung/clk-exynos5420.c @@ -11,8 +11,7 @@ */ #include <dt-bindings/clock/exynos5420.h> -#include <linux/clk.h> -#include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h> |