diff options
| author | Mike Turquette | 2014-06-11 01:53:25 +0200 |
|---|---|---|
| committer | Mike Turquette | 2014-06-11 01:53:25 +0200 |
| commit | 3f6eec9969d24f91a3909d51e86e007ca5efd4c4 (patch) | |
| tree | bff0f51bab78b18d52cfd57ad7cd8b78ac6a882c /drivers/clk/ti/gate.c | |
| parent | Merge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | ARM: dts: OMAP5/DRA7: use omap5-mpu-dpll-clock capable of dealing with higher... (diff) | |
| download | kernel-qcow2-linux-3f6eec9969d24f91a3909d51e86e007ca5efd4c4.tar.gz kernel-qcow2-linux-3f6eec9969d24f91a3909d51e86e007ca5efd4c4.tar.xz kernel-qcow2-linux-3f6eec9969d24f91a3909d51e86e007ca5efd4c4.zip | |
Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-next
Diffstat (limited to 'drivers/clk/ti/gate.c')
| -rw-r--r-- | drivers/clk/ti/gate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c index 58734817d502..b326d2797feb 100644 --- a/drivers/clk/ti/gate.c +++ b/drivers/clk/ti/gate.c @@ -185,7 +185,7 @@ of_ti_composite_no_wait_gate_clk_setup(struct device_node *node) CLK_OF_DECLARE(ti_composite_no_wait_gate_clk, "ti,composite-no-wait-gate-clock", of_ti_composite_no_wait_gate_clk_setup); -#ifdef CONFIG_ARCH_OMAP3 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) static void __init of_ti_composite_interface_clk_setup(struct device_node *node) { _of_ti_composite_gate_clk_setup(node, &clkhwops_iclk_wait); |