diff options
author | Mark Brown <broonie@kernel.org> | 2015-09-16 21:44:25 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-16 21:44:25 +0200 |
commit | 92243b6fc8fcb16bf401b055f7a0ba79f70a4115 (patch) | |
tree | 08e9fa205efb9bfab23b6ea59fc0a3eaa3fed82b /drivers/clk/mmp/clk-apmu.c | |
parent | spi: Fix documentation of spi_alloc_master() (diff) | |
parent | Linux 4.3-rc1 (diff) | |
download | linux-92243b6fc8fcb16bf401b055f7a0ba79f70a4115.tar.xz linux-92243b6fc8fcb16bf401b055f7a0ba79f70a4115.zip |
Merge tag 'v4.3-rc1' into spi-fix-doc
Linux 4.3-rc1
Diffstat (limited to 'drivers/clk/mmp/clk-apmu.c')
-rw-r--r-- | drivers/clk/mmp/clk-apmu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/clk/mmp/clk-apmu.c b/drivers/clk/mmp/clk-apmu.c index cdcf2d7f321e..47b5542ce50f 100644 --- a/drivers/clk/mmp/clk-apmu.c +++ b/drivers/clk/mmp/clk-apmu.c @@ -10,7 +10,6 @@ */ #include <linux/kernel.h> -#include <linux/clk.h> #include <linux/io.h> #include <linux/err.h> #include <linux/delay.h> |