diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2026-07-10 10:05:52 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2026-07-10 10:20:05 +0200 |
| commit | b470fde8f77b56ff273c5527484b99499b894e16 (patch) | |
| tree | bbf78ca301e5ead11fc65f51c1b2a4a06b5b81c7 /include/linux/of_platform.h | |
| parent | fe3e786ef4eb6e47d2901f568a27bd920477bbe9 (diff) | |
| parent | 2c7c88a412aa6d09cd04b414211b4ef8553b5309 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.2-rc3).
Conflicts:
tools/testing/selftests/net/lib.sh
dd6a23bac306b ("selftests: net: make busywait timeout clock portable")
895bad9cc4cec ("selftests: net: make busywait timeout clock portable")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'include/linux/of_platform.h')
| -rw-r--r-- | include/linux/of_platform.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index 17471ef8e092..181c438a9b0a 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h @@ -6,7 +6,9 @@ * <benh@kernel.crashing.org> */ -#include <linux/mod_devicetable.h> +#include <linux/types.h> +#include <linux/err.h> +#include <linux/device-id/of.h> struct device; struct device_node; |