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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
ibmebus.c
diff --git
a/arch/powerpc/kernel/ibmebus.c
b/arch/powerpc/kernel/ibmebus.c
index
c00d4ca
..
28581f1
100644
(file)
--- a/
arch/powerpc/kernel/ibmebus.c
+++ b/
arch/powerpc/kernel/ibmebus.c
@@
-527,7
+527,7
@@
static int ibmebus_bus_pm_resume_noirq(struct device *dev)
#endif /* !CONFIG_SUSPEND */
#endif /* !CONFIG_SUSPEND */
-#ifdef CONFIG_HIBERNAT
ION
+#ifdef CONFIG_HIBERNAT
E_CALLBACKS
static int ibmebus_bus_pm_freeze(struct device *dev)
{
static int ibmebus_bus_pm_freeze(struct device *dev)
{
@@
-665,7
+665,7
@@
static int ibmebus_bus_pm_restore_noirq(struct device *dev)
return ret;
}
return ret;
}
-#else /* !CONFIG_HIBERNAT
ION
*/
+#else /* !CONFIG_HIBERNAT
E_CALLBACKS
*/
#define ibmebus_bus_pm_freeze NULL
#define ibmebus_bus_pm_thaw NULL
#define ibmebus_bus_pm_freeze NULL
#define ibmebus_bus_pm_thaw NULL
@@
-676,7
+676,7
@@
static int ibmebus_bus_pm_restore_noirq(struct device *dev)
#define ibmebus_bus_pm_poweroff_noirq NULL
#define ibmebus_bus_pm_restore_noirq NULL
#define ibmebus_bus_pm_poweroff_noirq NULL
#define ibmebus_bus_pm_restore_noirq NULL
-#endif /* !CONFIG_HIBERNAT
ION
*/
+#endif /* !CONFIG_HIBERNAT
E_CALLBACKS
*/
static struct dev_pm_ops ibmebus_bus_dev_pm_ops = {
.prepare = ibmebus_bus_pm_prepare,
static struct dev_pm_ops ibmebus_bus_dev_pm_ops = {
.prepare = ibmebus_bus_pm_prepare,