nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

bt: realtek: Fix build for Linux v6.12

Browse Source 
In Linux v6.12, commit 5f60d5f6bbc1 ("move asm/unaligned.h to
linux/unaligned.h") moved the 'unaligned.h' header file. The 'rtk_bt.c'
source file does not need this header and so it can be removed. It is
needed in the 'rtk_misc.c' header and so fix this accordingly.

Bug 4876974

Change-Id: Iabeb6d8a95e131a8b6bc2d1e2b97e8539babf19f
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3252433
(cherry picked from commit 1f8df590e6a8f881fb7025d85095e812d4a98dfa)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3270382
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
This commit is contained in:
Jon Hunter
2024-10-03 10:19:22 +01:00
committed by mobile promotions
parent 51f89ad89e
commit aef3f30099
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/bluetooth/realtek/rtk_bt.c
View File

@@ -31,7 +31,6 @@
#include <linux/dcache.h> #include <linux/dcache.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <net/sock.h> #include <net/sock.h>
#include <asm/unaligned.h>
#include "rtk_bt.h" #include "rtk_bt.h"
#include "rtk_misc.h" #include "rtk_misc.h"

8
drivers/bluetooth/realtek/rtk_misc.c
View File

@@ -30,8 +30,14 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/dcache.h> #include <linux/dcache.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/version.h>
#include <net/sock.h> #include <net/sock.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
#include <linux/unaligned.h>
#else
#include <asm/unaligned.h> #include <asm/unaligned.h>
#endif
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
@@ -46,8 +52,6 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32)
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#endif #endif