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
PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS
[pandora-kernel.git]
/
drivers
/
amba
/
bus.c
diff --git
a/drivers/amba/bus.c
b/drivers/amba/bus.c
index
6d2bb25
..
7025593
100644
(file)
--- a/
drivers/amba/bus.c
+++ b/
drivers/amba/bus.c
@@
-214,7
+214,7
@@
static int amba_pm_resume_noirq(struct device *dev)
#endif /* !CONFIG_SUSPEND */
#endif /* !CONFIG_SUSPEND */
-#ifdef CONFIG_HIBERNAT
ION
+#ifdef CONFIG_HIBERNAT
E_CALLBACKS
static int amba_pm_freeze(struct device *dev)
{
static int amba_pm_freeze(struct device *dev)
{
@@
-352,7
+352,7
@@
static int amba_pm_restore_noirq(struct device *dev)
return ret;
}
return ret;
}
-#else /* !CONFIG_HIBERNAT
ION
*/
+#else /* !CONFIG_HIBERNAT
E_CALLBACKS
*/
#define amba_pm_freeze NULL
#define amba_pm_thaw NULL
#define amba_pm_freeze NULL
#define amba_pm_thaw NULL
@@
-363,7
+363,7
@@
static int amba_pm_restore_noirq(struct device *dev)
#define amba_pm_poweroff_noirq NULL
#define amba_pm_restore_noirq NULL
#define amba_pm_poweroff_noirq NULL
#define amba_pm_restore_noirq NULL
-#endif /* !CONFIG_HIBERNAT
ION
*/
+#endif /* !CONFIG_HIBERNAT
E_CALLBACKS
*/
#ifdef CONFIG_PM
#ifdef CONFIG_PM
@@
-760,7
+760,7
@@
int amba_request_regions(struct amba_device *dev, const char *name)
}
/**
}
/**
- * amba_release_regions - release mem regions asso
ic
ated with device
+ * amba_release_regions - release mem regions asso
ci
ated with device
* @dev: amba_device structure for device
*
* Release regions claimed by a successful call to amba_request_regions.
* @dev: amba_device structure for device
*
* Release regions claimed by a successful call to amba_request_regions.