git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
pm_bus.c
diff --git
a/arch/arm/mach-omap1/pm_bus.c
b/arch/arm/mach-omap1/pm_bus.c
index
fe31d93
..
334fb88
100644
(file)
--- a/
arch/arm/mach-omap1/pm_bus.c
+++ b/
arch/arm/mach-omap1/pm_bus.c
@@
-56,9
+56,13
@@
static struct dev_power_domain default_power_domain = {
USE_PLATFORM_PM_SLEEP_OPS
},
};
USE_PLATFORM_PM_SLEEP_OPS
},
};
+#define OMAP1_PWR_DOMAIN (&default_power_domain)
+#else
+#define OMAP1_PWR_DOMAIN NULL
+#endif /* CONFIG_PM_RUNTIME */
static struct pm_clk_notifier_block platform_bus_notifier = {
static struct pm_clk_notifier_block platform_bus_notifier = {
- .pwr_domain =
&default_power_domain
,
+ .pwr_domain =
OMAP1_PWR_DOMAIN
,
.con_ids = { "ick", "fck", NULL, },
};
.con_ids = { "ick", "fck", NULL, },
};
@@
-72,4
+76,4
@@
static int __init omap1_pm_runtime_init(void)
return 0;
}
core_initcall(omap1_pm_runtime_init);
return 0;
}
core_initcall(omap1_pm_runtime_init);
-#endif /* CONFIG_PM_RUNTIME */
+