Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196041
b: refs/heads/master
c: 190e837
h: refs/heads/master
i:
  196039: 68d5159
v: v3
  • Loading branch information
Kevin Hilman authored and Greg Kroah-Hartman committed May 21, 2010
1 parent c323004 commit 3b47580
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: da5e4ef7fdb8f2fb0878dee3bd9d4dd10cea8cf1
refs/heads/master: 190e8370b8033f746db5289e9324174564a6f5a7
8 changes: 4 additions & 4 deletions trunk/drivers/base/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ static void platform_pm_complete(struct device *dev)

#ifdef CONFIG_SUSPEND

static int platform_pm_suspend(struct device *dev)
int __weak platform_pm_suspend(struct device *dev)
{
struct device_driver *drv = dev->driver;
int ret = 0;
Expand All @@ -753,7 +753,7 @@ static int platform_pm_suspend(struct device *dev)
return ret;
}

static int platform_pm_suspend_noirq(struct device *dev)
int __weak platform_pm_suspend_noirq(struct device *dev)
{
struct device_driver *drv = dev->driver;
int ret = 0;
Expand All @@ -769,7 +769,7 @@ static int platform_pm_suspend_noirq(struct device *dev)
return ret;
}

static int platform_pm_resume(struct device *dev)
int __weak platform_pm_resume(struct device *dev)
{
struct device_driver *drv = dev->driver;
int ret = 0;
Expand All @@ -787,7 +787,7 @@ static int platform_pm_resume(struct device *dev)
return ret;
}

static int platform_pm_resume_noirq(struct device *dev)
int __weak platform_pm_resume_noirq(struct device *dev)
{
struct device_driver *drv = dev->driver;
int ret = 0;
Expand Down

0 comments on commit 3b47580

Please sign in to comment.