diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-21 17:17:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-21 17:17:26 -0500 |
| commit | adfafefd104d840ee4461965f22624d77532675b (patch) | |
| tree | 6c6ba553a2b11703bf5952bd789905ea37c4fc4f /include/linux | |
| parent | 460c1338fc05add0e8050d4945a46f207b13a5fc (diff) | |
| parent | 403f307576396f3362fbb65af190885b6036c72c (diff) | |
Merge branch 'hibernate'
* hibernate:
PM: Fix suspend_console and resume_console to use only one semaphore
PM: Wait for console in resume
PM: Fix pm_notifiers during user mode hibernation
swsusp: clean up shrink_all_zones()
swsusp: dont fiddle with swappiness
PM: fix build for CONFIG_PM unset
PM/hibernate: fix "swap breaks after hibernation failures"
PM/resume: wait for device probing to finish
Consolidate driver_probe_done() loops into one place
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 45e5b1921fbb..47f343c7bdda 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -147,6 +147,8 @@ extern void put_driver(struct device_driver *drv); | |||
| 147 | extern struct device_driver *driver_find(const char *name, | 147 | extern struct device_driver *driver_find(const char *name, |
| 148 | struct bus_type *bus); | 148 | struct bus_type *bus); |
| 149 | extern int driver_probe_done(void); | 149 | extern int driver_probe_done(void); |
| 150 | extern int wait_for_device_probe(void); | ||
| 151 | |||
| 150 | 152 | ||
| 151 | /* sysfs interface for exporting driver attributes */ | 153 | /* sysfs interface for exporting driver attributes */ |
| 152 | 154 | ||