[ARM] omap: provide a NULL clock operations structure

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / clock.c

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index d3213f565d5f172f15e3026454f9b94f4f8180c3..fa99c0b71d3f2959bf918f46928012a3130116d4 100644 (file)
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -271,7 +271,7 @@ int _omap2_clk_enable(struct clk *clk)
 {
        u32 regval32;
 
-       if (clk->flags & (ALWAYS_ENABLED | PARENT_CONTROLS_CLOCK))
+       if (clk->flags & PARENT_CONTROLS_CLOCK)
                return 0;
 
        if (clk->ops && clk->ops->enable)
@@ -301,7 +301,7 @@ void _omap2_clk_disable(struct clk *clk)
 {
        u32 regval32;
 
-       if (clk->flags & (ALWAYS_ENABLED | PARENT_CONTROLS_CLOCK))
+       if (clk->flags & PARENT_CONTROLS_CLOCK)
                return;
 
        if (clk->ops && clk->ops->disable) {