diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-10-17 12:52:05 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-10-17 12:52:05 -0400 |
| commit | c141cf76918e25ec7bd433b47590e8c3f3d02542 (patch) | |
| tree | 1e3fcb7389980d9471114737f4a01588f56153cb /include/linux/etherdevice.h | |
| parent | af4f896f77b30bf6811696dc86fcf61c9daf1c85 (diff) | |
| parent | 26bb2dc102783fef49336b26a94563318f9790d3 (diff) | |
Merge drm/drm-next into drm-intel-next
Needed to bring some KVM changes to be able to include a fix in our Kconfig.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/linux/etherdevice.h')
| -rw-r--r-- | include/linux/etherdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index 30114c25ad12..ecf203f01034 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -21,7 +21,7 @@ #include <linux/netdevice.h> #include <linux/random.h> #include <linux/crc32.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <asm/bitsperlong.h> #ifdef __KERNEL__ |