diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-12 19:27:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-12 19:27:29 -0800 |
| commit | 9e0ce90e840d8c9220f576726ed43acdb42e61f0 (patch) | |
| tree | cfec737e012aad006993889b1881ad6bd6269158 /include/linux | |
| parent | aa5743cc2c4fdd15e65367acc64bbb21a766d197 (diff) | |
| parent | c5f192ee17b40d30d8546567898ff958e6879f4c (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/driver-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 5 | ||||
| -rw-r--r-- | include/linux/kobject_uevent.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 49a01033a304..c64cec37dd69 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -268,12 +268,7 @@ struct device { void *platform_data; /* Platform specific data (e.g. ACPI, BIOS data relevant to device) */ struct dev_pm_info power; - u32 power_state; /* Current operating state. In - ACPI-speak, this is D0-D3, D0 - being fully functional, and D3 - being off. */ - unsigned char *saved_state; /* saved device state */ u32 detach_state; /* State to enter when device is detached from its driver. */ diff --git a/include/linux/kobject_uevent.h b/include/linux/kobject_uevent.h index 91405f7300a1..aa664fe7e561 100644 --- a/include/linux/kobject_uevent.h +++ b/include/linux/kobject_uevent.h @@ -28,6 +28,7 @@ enum kobject_action { KOBJ_MOUNT = (__force kobject_action_t) 0x04, /* mount event for block devices */ KOBJ_UMOUNT = (__force kobject_action_t) 0x05, /* umount event for block devices */ KOBJ_OFFLINE = (__force kobject_action_t) 0x06, /* offline event for hotplug devices */ + KOBJ_ONLINE = (__force kobject_action_t) 0x07, /* online event for hotplug devices */ }; |