diff options
| author | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2024-11-04 11:21:20 +0300 |
|---|---|---|
| committer | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2024-11-04 11:21:20 +0300 |
| commit | c787c2901e2c03008e536b86cb0103ce6fd05e2d (patch) | |
| tree | 06966989052f14f98c9b1ede0ea98822f317a586 /include/linux/etherdevice.h | |
| parent | a19d1db9a3fa89fabd7c83544b84f393ee9b851f (diff) | |
| parent | 30169bb64580bd7bce9290c1952bf0aa6cc37fe5 (diff) | |
| download | linux-c787c2901e2c03008e536b86cb0103ce6fd05e2d.tar.xz | |
Merge drm/drm-next into drm-xe-next
Backmerging to get up-to-date and to bring in a fix that was
merged through drm-misc-fixes.
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.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__ |