diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:09:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:09:35 +0200 |
| commit | 5790c58b133913f92fd737c03efce9db7a1d2d4d (patch) | |
| tree | deef8f070b4de7fcff62d496d09842ff91ed83d0 /drivers/clk/clk-zynq.c | |
| parent | 1194b152cd4eff475652785ce366b20afe82dfcf (diff) | |
| parent | 533ddeb1e86f506129ee388a6cc13796dcf31311 (diff) | |
| download | olio-linux-3.10-5790c58b133913f92fd737c03efce9db7a1d2d4d.tar.xz olio-linux-3.10-5790c58b133913f92fd737c03efce9db7a1d2d4d.zip | |
Merge branch 'depends/clk' into next/drivers
This is a snapshot of the stable clk branch at
git://git.linaro.org/people/mturquette/linux.git clk-for-3.10
which is a dependency for the tegra clock changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clk/clk-zynq.c')
| -rw-r--r-- | drivers/clk/clk-zynq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/clk-zynq.c b/drivers/clk/clk-zynq.c index b14a25f3925..32062977f45 100644 --- a/drivers/clk/clk-zynq.c +++ b/drivers/clk/clk-zynq.c @@ -20,6 +20,7 @@ #include <linux/slab.h> #include <linux/kernel.h> #include <linux/clk-provider.h> +#include <linux/clk/zynq.h> static void __iomem *slcr_base; |