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-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
pm_bus.c
diff --git
a/arch/arm/mach-omap2/pm_bus.c
b/arch/arm/mach-omap2/pm_bus.c
index
784989f
..
5acd2ab
100644
(file)
--- a/
arch/arm/mach-omap2/pm_bus.c
+++ b/
arch/arm/mach-omap2/pm_bus.c
@@
-20,7
+20,7
@@
#include <plat/omap-pm.h>
#ifdef CONFIG_PM_RUNTIME
#include <plat/omap-pm.h>
#ifdef CONFIG_PM_RUNTIME
-int omap_pm_runtime_suspend(struct device *dev)
+
static
int omap_pm_runtime_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
int r, ret = 0;
{
struct platform_device *pdev = to_platform_device(dev);
int r, ret = 0;
@@
-37,7
+37,7
@@
int omap_pm_runtime_suspend(struct device *dev)
return ret;
};
return ret;
};
-int omap_pm_runtime_resume(struct device *dev)
+
static
int omap_pm_runtime_resume(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
int r;
{
struct platform_device *pdev = to_platform_device(dev);
int r;