diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-27 18:54:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-27 18:54:13 +0100 |
| commit | 8f677bc819e7a74cf10e30daf06e8b151d1e6a94 (patch) | |
| tree | 379e4e32a06dfb6d2ca3519ca4ef6b7507fad197 /include/linux/platform_device.h | |
| parent | docs: driver-model: Add documentation for sync_state (diff) | |
| parent | Linux 5.4-rc5 (diff) | |
| download | wireguard-linux-8f677bc819e7a74cf10e30daf06e8b151d1e6a94.tar.xz wireguard-linux-8f677bc819e7a74cf10e30daf06e8b151d1e6a94.zip | |
Merge 5.4-rc5 into driver-core-next
We want the sysfs fix in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/platform_device.h')
| -rw-r--r-- | include/linux/platform_device.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index f086b6a1bc6b..51fb7fc28587 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -64,6 +64,8 @@ extern struct resource *platform_get_resource_byname(struct platform_device *, unsigned int, const char *); extern int platform_get_irq_byname(struct platform_device *, const char *); +extern int platform_get_irq_byname_optional(struct platform_device *dev, + const char *name); extern int platform_add_devices(struct platform_device **, int); struct platform_device_info { |