---

yaml --- r: 67967 b: refs/heads/master c: b4d1eb2 h: refs/heads/master i: 67965: e65d6ba 67963: fe9267d 67959: 461f7bb 67951: 503ffec 67935: 0823c4f 67903: 077b110 67839: 132368d v: v3
git-mirror · Oct 12, 2007 · a3690ac · a3690ac
1 parent c8b1a2b
commit a3690ac
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 109f0e93b6b728f03c1eb4af02bc25d71b646c59
+refs/heads/master: b4d1eb2ccecb76bce4c2125c5a3e77753fcfaeb0
diff --git a/trunk/drivers/base/power/power.h b/trunk/drivers/base/power/power.h
@@ -55,12 +55,6 @@ extern void dpm_sysfs_remove(struct device *);
 
 extern void dpm_resume(void);
 extern void dpm_power_up(void);
-extern int resume_device(struct device *);
-
-/*
- * suspend.c
- */
-extern int suspend_device(struct device *, pm_message_t);
 
 #else /* CONFIG_PM_SLEEP */
 

diff --git a/trunk/drivers/base/power/resume.c b/trunk/drivers/base/power/resume.c
@@ -20,7 +20,7 @@
  *
  */
 
-int resume_device(struct device * dev)
+static int resume_device(struct device * dev)
 {
 	int error = 0;
 

diff --git a/trunk/drivers/base/power/suspend.c b/trunk/drivers/base/power/suspend.c
@@ -54,7 +54,7 @@ suspend_device_dbg(struct device *dev, pm_message_t state, char *info)
  *	@state:	Power state device is entering.
  */
 
-int suspend_device(struct device * dev, pm_message_t state)
+static int suspend_device(struct device * dev, pm_message_t state)
 {
 	int error = 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ @@
      *
      */
-    int resume_device(struct device * dev)
+    static int resume_device(struct device * dev)
     {
     	int error = 0;
@@ Expand Down @@