diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2024-10-12 11:22:25 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2024-10-12 11:43:29 +0100 |
| commit | 220c71dafaa28cbb75fd785670cf68a758347026 (patch) | |
| tree | 47a974cd3ea71ba59116037b56a509c41a430b63 /net/802/mrp.c | |
| parent | 6a9262edff8ea44e9968b6b271c36d81c6a1f841 (diff) | |
| parent | 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff) | |
| download | lwn-220c71dafaa28cbb75fd785670cf68a758347026.tar.gz lwn-220c71dafaa28cbb75fd785670cf68a758347026.zip | |
Merge tag 'v6.12-rc2' into test2
Linux 6.12-rc2
Resolved movement of asm/unaligned.h to linux/unaligned.h
Diffstat (limited to 'net/802/mrp.c')
| -rw-r--r-- | net/802/mrp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/802/mrp.c b/net/802/mrp.c index 3154d7409493..e0c96d0da8d5 100644 --- a/net/802/mrp.c +++ b/net/802/mrp.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <net/mrp.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> static unsigned int mrp_join_time __read_mostly = 200; module_param(mrp_join_time, uint, 0644); |