diff options
| author | Dmitry Torokhov <[email protected]> | 2022-01-17 18:03:39 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2022-01-17 18:03:39 -0800 |
| commit | 87a0b2fafc09766d8c55461a18345a1cfb10a7fe (patch) | |
| tree | f2ecd87b34a4709e49b51470056f6b6e528fefca /include/linux/device | |
| parent | b6e43dddaea3dbfa93327f986beb3ec5e8157c4c (diff) | |
| parent | df0cc57e057f18e44dac8e6c18aba47ab53202f9 (diff) | |
Merge tag 'v5.16' into next
Sync up with mainline to bring in the latest API changes.
Diffstat (limited to 'include/linux/device')
| -rw-r--r-- | include/linux/device/bus.h | 1 | ||||
| -rw-r--r-- | include/linux/device/driver.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index 062777a45a74..a039ab809753 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -143,6 +143,7 @@ int device_match_of_node(struct device *dev, const void *np); int device_match_fwnode(struct device *dev, const void *fwnode); int device_match_devt(struct device *dev, const void *pdevt); int device_match_acpi_dev(struct device *dev, const void *adev); +int device_match_acpi_handle(struct device *dev, const void *handle); int device_match_any(struct device *dev, const void *unused); /* iterator helpers for buses */ diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h index a498ebcf4993..15e7c5e15d62 100644 --- a/include/linux/device/driver.h +++ b/include/linux/device/driver.h @@ -18,6 +18,7 @@ #include <linux/klist.h> #include <linux/pm.h> #include <linux/device/bus.h> +#include <linux/module.h> /** * enum probe_type - device driver probe type to try |