summaryrefslogtreecommitdiffstats
path: root/drivers/clk/clk-zynq.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-04-04 16:08:13 -0600
committerStephen Warren <swarren@nvidia.com>2013-04-04 16:08:13 -0600
commit43089433b00a086980fc6e9571535477fb749e84 (patch)
tree194817879be6f5cc5e56bc2ab2c3276af146238c /drivers/clk/clk-zynq.c
parent8aa15d82df291b398d604b527a20310f10c1c706 (diff)
parent533ddeb1e86f506129ee388a6cc13796dcf31311 (diff)
downloadlinux-43089433b00a086980fc6e9571535477fb749e84.tar.bz2
Merge remote-tracking branch 'linaro_mturquette_linux/clk-for-3.10' into for-3.10/clk
Diffstat (limited to 'drivers/clk/clk-zynq.c')
-rw-r--r--drivers/clk/clk-zynq.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/clk-zynq.c b/drivers/clk/clk-zynq.c
index b14a25f39255..32062977f453 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;