diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2024-09-27 08:13:52 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-09-27 08:13:52 +0200 |
| commit | 3a39d672e7f48b8d6b91a09afa4b55352773b4b5 (patch) | |
| tree | f7ec4043b508f48430dd09ac338c38acf7d5a6cd /drivers/platform/x86/intel_scu_ipc.c | |
| parent | net: sparx5: Fix invalid timestamps (diff) | |
| parent | Merge tag 'net-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | wireguard-linux-3a39d672e7f48b8d6b91a09afa4b55352773b4b5.tar.xz wireguard-linux-3a39d672e7f48b8d6b91a09afa4b55352773b4b5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts and no adjacent changes.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/platform/x86/intel_scu_ipc.c')
| -rw-r--r-- | drivers/platform/x86/intel_scu_ipc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c index a68df4133403..5b16d29c93d7 100644 --- a/drivers/platform/x86/intel_scu_ipc.c +++ b/drivers/platform/x86/intel_scu_ipc.c @@ -23,7 +23,7 @@ #include <linux/module.h> #include <linux/slab.h> -#include <asm/intel_scu_ipc.h> +#include <linux/platform_data/x86/intel_scu_ipc.h> /* IPC defines the following message types */ #define IPCMSG_PCNTRL 0xff /* Power controller unit read/write */ |