Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-next

[sfrench/cifs-2.6.git] / drivers / clk / ti / gate.c

diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c
index 58734817d5027956107fef67847f2585a691afdc..b326d2797feb23c0ed84fe52be5b9905102f0234 100644 (file)
--- 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);