diff options
| author | Anton Blanchard <anton@samba.org> | 2003-08-23 23:39:08 +1000 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2003-08-23 23:39:08 +1000 |
| commit | afb753ea258c299f0f4615917bd6f7d65fcaeca5 (patch) | |
| tree | b29d6cac75d5093374085a50dde41818e744d034 /include/linux/device.h | |
| parent | 4665cdeef2451654762157c7c1c405fc4aae011b (diff) | |
| parent | ad556f8fd773a60cb5a2c08d42f3a68b61c5b982 (diff) | |
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/tmp3
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 7b49400adf31..8d6266f2e3c3 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -58,7 +58,8 @@ struct bus_type { struct device * (*add) (struct device * parent, char * bus_id); int (*hotplug) (struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size); - + int (*suspend)(struct device * dev, u32 state); + int (*resume)(struct device * dev); }; extern int bus_register(struct bus_type * bus); @@ -372,8 +373,6 @@ extern struct bus_type platform_bus_type; extern struct device legacy_bus; /* drivers/base/power.c */ -extern int device_suspend(u32 state, u32 level); -extern void device_resume(u32 level); extern void device_shutdown(void); |