Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-2.6.git] / kernel / power / Kconfig
index bcd8fce..b1914cb 100644 (file)
@@ -224,6 +224,10 @@ config PM_OPP
          implementations a ready to use framework to manage OPPs.
          For more information, read <file:Documentation/power/opp.txt>
 
-config PM_RUNTIME_CLK
+config PM_CLK
        def_bool y
-       depends on PM_RUNTIME && HAVE_CLK
+       depends on PM && HAVE_CLK
+
+config PM_GENERIC_DOMAINS
+       bool
+       depends on PM