diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /drivers/base/base.h | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/base/base.h')
| -rw-r--r-- | drivers/base/base.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h index 0a5f055dffba..9f50f1b545dc 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h | |||
| @@ -88,8 +88,6 @@ extern void driver_detach(struct device_driver *drv); | |||
| 88 | extern int driver_probe_device(struct device_driver *drv, struct device *dev); | 88 | extern int driver_probe_device(struct device_driver *drv, struct device *dev); |
| 89 | 89 | ||
| 90 | extern void sysdev_shutdown(void); | 90 | extern void sysdev_shutdown(void); |
| 91 | extern int sysdev_suspend(pm_message_t state); | ||
| 92 | extern int sysdev_resume(void); | ||
| 93 | 91 | ||
| 94 | extern char *make_class_name(const char *name, struct kobject *kobj); | 92 | extern char *make_class_name(const char *name, struct kobject *kobj); |
| 95 | 93 | ||