summaryrefslogtreecommitdiffstats
path: root/include/net/calipso.h
diff options
context:
space:
mode:
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>2024-10-14 09:03:34 +0200
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>2024-10-14 09:03:34 +0200
commitbebb45743d52fea1ac0a4a9f465f11d11e885f40 (patch)
treea1dda3e26ac754e78cbb9734dae3f13f3a8adf39 /include/net/calipso.h
parentea7f2dfd13e096dce3198e5ffdb00d21bf7c8fe5 (diff)
parent8e929cb546ee42c9a61d24fae60605e9e3192354 (diff)
downloadlinux-bebb45743d52fea1ac0a4a9f465f11d11e885f40.tar.gz
linux-bebb45743d52fea1ac0a4a9f465f11d11e885f40.tar.bz2
linux-bebb45743d52fea1ac0a4a9f465f11d11e885f40.zip
Merge tag 'v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next
Linux 6.12-rc3
Diffstat (limited to 'include/net/calipso.h')
-rw-r--r--include/net/calipso.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/calipso.h b/include/net/calipso.h
index f8667a3fda9e..76b9e08c10c2 100644
--- a/include/net/calipso.h
+++ b/include/net/calipso.h
@@ -25,7 +25,7 @@
#include <net/netlabel.h>
#include <net/request_sock.h>
#include <linux/refcount.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
/* known doi values */
#define CALIPSO_DOI_UNKNOWN 0x00000000