aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm4908
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-07-21 16:19:32 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-29 23:03:41 +0200
commit7d3c0928de191b203dd5b27ddf208698d08639e3 (patch)
treee30438f3e37630608b954e6dd02b0ad1b17fd880 /target/linux/bcm4908
parent57cad53f4e52be987cdd61308ff7d2704baca539 (diff)
downloadupstream-7d3c0928de191b203dd5b27ddf208698d08639e3.tar.gz
upstream-7d3c0928de191b203dd5b27ddf208698d08639e3.tar.bz2
upstream-7d3c0928de191b203dd5b27ddf208698d08639e3.zip
kernel: bump 5.10 to 5.10.132
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/bcm4908')
-rw-r--r--target/linux/bcm4908/patches-5.10/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch4
-rw-r--r--target/linux/bcm4908/patches-5.10/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm4908/patches-5.10/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch b/target/linux/bcm4908/patches-5.10/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch
index a03d538db9..ea75181a6e 100644
--- a/target/linux/bcm4908/patches-5.10/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch
+++ b/target/linux/bcm4908/patches-5.10/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch
@@ -21,8 +21,8 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -1779,7 +1779,7 @@ config BCM7038_WDT
- tristate "BCM63xx/BCM7038 Watchdog"
+@@ -1800,7 +1800,7 @@ config BCM7038_WDT
+ tristate "BCM7038 Watchdog"
select WATCHDOG_CORE
depends on HAS_IOMEM
- depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
diff --git a/target/linux/bcm4908/patches-5.10/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch b/target/linux/bcm4908/patches-5.10/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch
index 9d11a55ffa..d6d2fd9ab6 100644
--- a/target/linux/bcm4908/patches-5.10/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch
+++ b/target/linux/bcm4908/patches-5.10/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch
@@ -24,7 +24,7 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
--- a/drivers/watchdog/bcm7038_wdt.c
+++ b/drivers/watchdog/bcm7038_wdt.c
-@@ -218,6 +218,7 @@ static SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops, bcm7038_wdt_suspend,
+@@ -193,6 +193,7 @@ static SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_
bcm7038_wdt_resume);
static const struct of_device_id bcm7038_wdt_match[] = {