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/platform_data/x86/int3472.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/platform_data/x86/int3472.h')
| -rw-r--r-- | include/linux/platform_data/x86/int3472.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/x86/int3472.h b/include/linux/platform_data/x86/int3472.h index 93f1e1fe09b4..a73841dfae27 100644 --- a/include/linux/platform_data/x86/int3472.h +++ b/include/linux/platform_data/x86/int3472.h @@ -13,6 +13,7 @@ #include <linux/leds.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> +#include <linux/device-id/dmi.h> #include <linux/types.h> /* FIXME drop this once the I2C_DEV_NAME_FORMAT macro has been added to include/linux/i2c.h */ @@ -72,7 +73,6 @@ container_of(clk, struct int3472_discrete_device, clock) struct acpi_device; -struct dmi_system_id; struct i2c_client; struct platform_device; |