diff options
author | Nick Hainke <vincent@systemli.org> | 2022-09-28 11:23:24 +0200 |
---|---|---|
committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-12 13:02:42 +0200 |
commit | 975b436cdf05e53e4792f14f9f601759416761fb (patch) | |
tree | 063a9df5315531c29aafc1374074cbaffdad47be /target/linux/ath25/patches-5.15/130-watchdog.patch | |
parent | d7ab4d76b12ce01c792b3e51974e20463185d4ca (diff) | |
download | upstream-975b436cdf05e53e4792f14f9f601759416761fb.tar.gz upstream-975b436cdf05e53e4792f14f9f601759416761fb.tar.bz2 upstream-975b436cdf05e53e4792f14f9f601759416761fb.zip |
ath25: 5.15: enable 5.15 testing kernel
Manually refreshed:
- 140-redboot_boardconfig.patch
- 141-redboot_partition_scan.patch
- 142-redboot_various_erase_size_fix.patch
Automatically refreshed:
- 107-ar5312_gpio.patch
- 108-ar2315_gpio.patch
- 110-ar2313_ethernet.patch
- 120-spiflash.patch
- 130-watchdog.patch
- 330-board_leds.patch
Use "make kernel_oldconfig" to refresh the new kernel config.
The Ubiquiti Nanostation 2 (XS2) and Ubiquiti Nanostation 5 (XS5) should
be marked as broken when switching to 5.15 by default. The new kernel
does not fit anymore into the partition.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Diffstat (limited to 'target/linux/ath25/patches-5.15/130-watchdog.patch')
-rw-r--r-- | target/linux/ath25/patches-5.15/130-watchdog.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ath25/patches-5.15/130-watchdog.patch b/target/linux/ath25/patches-5.15/130-watchdog.patch index 1c8c9a9677..eb0bc5630d 100644 --- a/target/linux/ath25/patches-5.15/130-watchdog.patch +++ b/target/linux/ath25/patches-5.15/130-watchdog.patch @@ -212,7 +212,7 @@ +MODULE_ALIAS("platform:" DRIVER_NAME); --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -1873,6 +1873,13 @@ config PIC32_DMT +@@ -1829,6 +1829,13 @@ config PIC32_DMT To compile this driver as a loadable module, choose M here. The module will be called pic32-dmt. @@ -228,8 +228,8 @@ # POWERPC Architecture --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile -@@ -164,6 +164,7 @@ obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o - obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o +@@ -161,6 +161,7 @@ obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o + obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o +obj-$(CONFIG_AR2315_WDT) += ar2315-wtd.o |