From a3690ac9b5efc3113786e9e12351fb8ece5e7491 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 10 Aug 2007 13:51:09 -0700
Subject: [PATCH] --- yaml --- r: 67967 b: refs/heads/master c:
 b4d1eb2ccecb76bce4c2125c5a3e77753fcfaeb0 h: refs/heads/master i:   67965:
 e65d6ba26990a75db578e96ed255d20964ed3640   67963:
 fe9267d72eada785b96fc97a2a009df8acf6d46c   67959:
 461f7bb57abe914c35080fe3caf04a5757e45d26   67951:
 503ffeceddb78f38ecd0a5035fd2dd6bbe653f48   67935:
 0823c4f69e2d9bc2df7a02f1605713af897e0aaf   67903:
 077b1102aecafa4651f6bbd253fe8c54a23852d6   67839:
 132368dd610ddc8b17cbdeb1bc3bab7e3faf9439 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/base/power/power.h   | 6 ------
 trunk/drivers/base/power/resume.c  | 2 +-
 trunk/drivers/base/power/suspend.c | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 8fca0955f562..aa19b7a6b092 100644
--- 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
index 8ba0830cbc03..49e64dbcce96 100644
--- 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
index 00fd84ae6e66..67948bac9938 100644
--- 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
index 26df9b231737..204517afb15e 100644
--- 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;