diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-07-13 07:11:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-07-13 07:11:57 +0200 |
| commit | c1d4ce2d9eaeccd7e8aef7ec1109df49eaf4f503 (patch) | |
| tree | cdb1b2876a231901613867976421092ddbb2d46f /include/linux/device/driver.h | |
| parent | bef5e068b89b0f0cf974c987ebba9869a14b44c6 (diff) | |
| parent | a13c140cc289c0b7b3770bce5b3ad42ab35074aa (diff) | |
Merge 7.2-rc3 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/device/driver.h')
| -rw-r--r-- | include/linux/device/driver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h index 38048e74d10a..768a1334c0a1 100644 --- a/include/linux/device/driver.h +++ b/include/linux/device/driver.h @@ -19,6 +19,8 @@ #include <linux/pm.h> #include <linux/device/bus.h> #include <linux/module.h> +#include <linux/device-id/acpi.h> +#include <linux/device-id/of.h> /** * enum probe_type - device driver probe type to try |