Merge branch 'x86/mce' into x86/urgent

[karo-tx-linux.git] / arch / arm / mach-omap2 / powerdomain.c

diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index 96ad3dbeac3433b877028800e6b3a621b7e67666..96114901b932a815296bb85632c3d2f69f526eb4 100644 (file)
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -981,16 +981,6 @@ int pwrdm_state_switch(struct powerdomain *pwrdm)
        return ret;
 }
 
-int pwrdm_clkdm_state_switch(struct clockdomain *clkdm)
-{
-       if (clkdm != NULL && clkdm->pwrdm.ptr != NULL) {
-               pwrdm_wait_transition(clkdm->pwrdm.ptr);
-               return pwrdm_state_switch(clkdm->pwrdm.ptr);
-       }
-
-       return -EINVAL;
-}
-
 int pwrdm_pre_transition(void)
 {
        pwrdm_for_each(_pwrdm_pre_transition_cb, NULL);