diff options
Diffstat (limited to 'drivers/base/power')
-rw-r--r-- | drivers/base/power/power.h | 6 | ||||
-rw-r--r-- | drivers/base/power/resume.c | 2 | ||||
-rw-r--r-- | drivers/base/power/suspend.c | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h index 8ba0830cbc03..49e64dbcce96 100644 --- a/drivers/base/power/power.h +++ b/drivers/base/power/power.h | |||
@@ -55,12 +55,6 @@ extern void dpm_sysfs_remove(struct device *); | |||
55 | 55 | ||
56 | extern void dpm_resume(void); | 56 | extern void dpm_resume(void); |
57 | extern void dpm_power_up(void); | 57 | extern void dpm_power_up(void); |
58 | extern int resume_device(struct device *); | ||
59 | |||
60 | /* | ||
61 | * suspend.c | ||
62 | */ | ||
63 | extern int suspend_device(struct device *, pm_message_t); | ||
64 | 58 | ||
65 | #else /* CONFIG_PM_SLEEP */ | 59 | #else /* CONFIG_PM_SLEEP */ |
66 | 60 | ||
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c index 00fd84ae6e66..67948bac9938 100644 --- a/drivers/base/power/resume.c +++ b/drivers/base/power/resume.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | int resume_device(struct device * dev) | 23 | static int resume_device(struct device * dev) |
24 | { | 24 | { |
25 | int error = 0; | 25 | int error = 0; |
26 | 26 | ||
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c index 26df9b231737..204517afb15e 100644 --- a/drivers/base/power/suspend.c +++ b/drivers/base/power/suspend.c | |||
@@ -54,7 +54,7 @@ suspend_device_dbg(struct device *dev, pm_message_t state, char *info) | |||
54 | * @state: Power state device is entering. | 54 | * @state: Power state device is entering. |
55 | */ | 55 | */ |
56 | 56 | ||
57 | int suspend_device(struct device * dev, pm_message_t state) | 57 | static int suspend_device(struct device * dev, pm_message_t state) |
58 | { | 58 | { |
59 | int error = 0; | 59 | int error = 0; |
60 | 60 | ||