summaryrefslogtreecommitdiffstats
path: root/drivers/clk/mxs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-11 03:38:03 -0700
committerOlof Johansson <olof@lixom.net>2013-04-11 03:38:03 -0700
commit83c15f4c05757b3c5fe1551a474458fd16d27bae (patch)
treec9631bf611794e15a0afc3fb0673e7e494ca94d0 /drivers/clk/mxs
parentd6e911b599517d3faaa53e125b174a318b33aca9 (diff)
parent918d7f6f68620e0721bb31402ebf87e15f826831 (diff)
downloadop-kernel-dev-83c15f4c05757b3c5fe1551a474458fd16d27bae.zip
op-kernel-dev-83c15f4c05757b3c5fe1551a474458fd16d27bae.tar.gz
Merge branch 'depends/clk-for-3.10' into next/cleanup
Bringin in clk subsystem dependencies needed by sunxi. * depends/clk-for-3.10: (26 commits) clk: sunxi: drop an unnecesary kmalloc clk: sunxi: drop CLK_IGNORE_UNUSED clk: sunxi: Add support for AXI, AHB, APB0 and APB1 gates clk: divider: Introduce CLK_DIVIDER_ALLOW_ZERO flag clk: mvebu: Use common of_clk_init() function clk: fix clk_mux::flags kerneldoc clk: allow reentrant calls into the clk framework clk: abstract locking out into helper functions clk: zynq: Add missing zynq clk header clk: sunxi: rename compatible strings arm: sunxi: Add useful information about sunxi clocks clk: arm: sunxi: Add a new clock driver for sunxi SOCs clk: ux500: Fix prcmu clocks registration ARM: imx: adapt clk_busy_mux to new clk_mux struct clk: Add composite clock type clk: add table lookup to mux clk: Fix incorrect return type in clk.c clk: prima2: fix return value check in sirfsoc_of_clk_init() clk:SPEAr1340: Correct parent clock configuration documentation: clk: fix couple of misspelling ...
Diffstat (limited to 'drivers/clk/mxs')
-rw-r--r--drivers/clk/mxs/clk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/mxs/clk.c b/drivers/clk/mxs/clk.c
index b24d560..5301bce 100644
--- a/drivers/clk/mxs/clk.c
+++ b/drivers/clk/mxs/clk.c
@@ -13,6 +13,7 @@
#include <linux/io.h>
#include <linux/jiffies.h>
#include <linux/spinlock.h>
+#include "clk.h"
DEFINE_SPINLOCK(mxs_lock);
OpenPOWER on IntegriCloud