kernel: bump 5.15 to 5.15.32

[openwrt/staging/chunkeey.git] / target / linux / ipq806x / patches-5.15 / 0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch

diff --git a/target/linux/ipq806x/patches-5.15/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch b/target/linux/ipq806x/patches-5.15/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch
index b56480deaa1b0a31dc4111769a9e333e87ef2fc6..1860cef800344e803b932ac4b70d1e3d6eabd06f 100644 (file)
--- a/target/linux/ipq806x/patches-5.15/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch
+++ b/target/linux/ipq806x/patches-5.15/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch
@@ -33,7 +33,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -321,7 +321,7 @@ config ARCH_MULTIPLATFORM
+@@ -317,7 +317,7 @@ config ARCH_MULTIPLATFORM
        select ARCH_SELECT_MEMORY_MODEL
        select ARM_HAS_SG_CHAIN
        select ARM_PATCH_PHYS_VIRT
@@ -41,10 +41,10 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
 +      select AUTO_ZRELADDR if !ARCH_QCOM
        select TIMER_OF
        select COMMON_CLK
-       select GENERIC_CLOCKEVENTS
+       select GENERIC_IRQ_MULTI_HANDLER
 --- a/arch/arm/Makefile
 +++ b/arch/arm/Makefile
-@@ -251,9 +251,11 @@ MACHINE  := arch/arm/mach-$(word 1,$(mac
+@@ -237,9 +237,11 @@ MACHINE  := arch/arm/mach-$(word 1,$(mac
  else
  MACHINE  :=
  endif