diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-22 12:00:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-22 12:00:15 +0200 |
| commit | 1af824f085e813e06548212b18bbc788b16f60e6 (patch) | |
| tree | 7e4bea76e0780330e27d660633ba514dc02e2fbf /include/linux/kobject.h | |
| parent | arch_topology: Get rid of cap_parsing_done (diff) | |
| parent | Input: axp20x-pek - switch to using devm_device_add_group() (diff) | |
| download | linux-dev-1af824f085e813e06548212b18bbc788b16f60e6.tar.xz linux-dev-1af824f085e813e06548212b18bbc788b16f60e6.zip | |
Merge branch 'bind_unbind' into driver-core-next
This merges the bind_unbind driver core feature into the
driver-core-next branch. bind_unbind is a branch so that others can
pull and work off of it safely.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/kobject.h')
| -rw-r--r-- | include/linux/kobject.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index eeab34b0f589..9e05c8b2c287 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -57,6 +57,8 @@ enum kobject_action { KOBJ_MOVE, KOBJ_ONLINE, KOBJ_OFFLINE, + KOBJ_BIND, + KOBJ_UNBIND, KOBJ_MAX }; |