summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-10-07 15:53:15 +0200
committerMark Brown <broonie@kernel.org>2024-10-07 15:53:15 +0200
commitc2a59c892f20379a3e48124a83491a12374cd7e0 (patch)
tree7f280fc4108d8ace769ba2e2368a53d71dcdbe4b /drivers/media/pci
parentspi: Provide defer reason if getting irq during probe fails (diff)
parentLinux 6.12-rc2 (diff)
downloadlinux-c2a59c892f20379a3e48124a83491a12374cd7e0.tar.xz
linux-c2a59c892f20379a3e48124a83491a12374cd7e0.zip
spi: Merge up v6.12
Fixes build issues with the KVM selftests.
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/bt8xx/bttv-cards.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c
index 867c1308de23..365b04e5ae4d 100644
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
@@ -24,7 +24,7 @@
#include <linux/firmware.h>
#include <net/checksum.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
#include <asm/io.h>
#include "bttvp.h"