diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
| commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
| tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /drivers/base/power/resume.c | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'drivers/base/power/resume.c')
| -rw-r--r-- | drivers/base/power/resume.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c index 0a7aa07b9a2a..317edbf0feca 100644 --- a/drivers/base/power/resume.c +++ b/drivers/base/power/resume.c | |||
| @@ -9,10 +9,9 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 12 | #include "../base.h" | ||
| 12 | #include "power.h" | 13 | #include "power.h" |
| 13 | 14 | ||
| 14 | extern int sysdev_resume(void); | ||
| 15 | |||
| 16 | 15 | ||
| 17 | /** | 16 | /** |
| 18 | * resume_device - Restore state for one device. | 17 | * resume_device - Restore state for one device. |