diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-22 13:24:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-22 13:24:52 -0500 |
| commit | c45ec6566021ba3162233b575e7bc76d57b86688 (patch) | |
| tree | bd994acbbadc78fce745fac3de44ee5cf5ff5a1a /include | |
| parent | 102d60a2d8a6b54a20317a855dca3b598a2fd581 (diff) | |
| parent | fa675765afed59bb89adba3369094ebd428b930b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kobject.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 2a8d8da709..c374b5fa8d 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h | |||
| @@ -41,8 +41,10 @@ enum kobject_action { | |||
| 41 | KOBJ_ADD = (__force kobject_action_t) 0x01, /* exclusive to core */ | 41 | KOBJ_ADD = (__force kobject_action_t) 0x01, /* exclusive to core */ |
| 42 | KOBJ_REMOVE = (__force kobject_action_t) 0x02, /* exclusive to core */ | 42 | KOBJ_REMOVE = (__force kobject_action_t) 0x02, /* exclusive to core */ |
| 43 | KOBJ_CHANGE = (__force kobject_action_t) 0x03, /* device state change */ | 43 | KOBJ_CHANGE = (__force kobject_action_t) 0x03, /* device state change */ |
| 44 | KOBJ_OFFLINE = (__force kobject_action_t) 0x04, /* device offline */ | 44 | KOBJ_MOUNT = (__force kobject_action_t) 0x04, /* mount event for block devices (broken) */ |
| 45 | KOBJ_ONLINE = (__force kobject_action_t) 0x05, /* device online */ | 45 | KOBJ_UMOUNT = (__force kobject_action_t) 0x05, /* umount event for block devices (broken) */ |
| 46 | KOBJ_OFFLINE = (__force kobject_action_t) 0x06, /* device offline */ | ||
| 47 | KOBJ_ONLINE = (__force kobject_action_t) 0x07, /* device online */ | ||
| 46 | }; | 48 | }; |
| 47 | 49 | ||
| 48 | struct kobject { | 50 | struct kobject { |