diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 15:39:40 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 15:39:40 +0200 |
commit | 20ac422c8ef753ae0da0c9312443b03c37cfbb5b (patch) | |
tree | 6476e9fa2504a002b105367007dcb6abc3391b96 /arch/s390/include/asm/ccwgroup.h | |
parent | 54fa156bb33ad06077ec709dc2331a4d5ee446f3 (diff) | |
parent | 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 (diff) | |
download | linux-20ac422c8ef753ae0da0c9312443b03c37cfbb5b.tar.gz |
Merge 5.15-rc3 into char-misc next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/include/asm/ccwgroup.h')
-rw-r--r-- | arch/s390/include/asm/ccwgroup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h index 36dbf5043fc0..aa995d91cd1d 100644 --- a/arch/s390/include/asm/ccwgroup.h +++ b/arch/s390/include/asm/ccwgroup.h @@ -55,7 +55,7 @@ int ccwgroup_create_dev(struct device *root, struct ccwgroup_driver *gdrv, int num_devices, const char *buf); extern int ccwgroup_set_online(struct ccwgroup_device *gdev); -extern int ccwgroup_set_offline(struct ccwgroup_device *gdev); +int ccwgroup_set_offline(struct ccwgroup_device *gdev, bool call_gdrv); extern int ccwgroup_probe_ccwdev(struct ccw_device *cdev); extern void ccwgroup_remove_ccwdev(struct ccw_device *cdev); |