aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-10-02 15:28:55 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-10-02 16:45:56 +0200
commit50f456b46cbae27ed13badfe7b2976cd01b67a57 (patch)
tree9911069e0538585942fe2c16685e7ed3afbff674 /target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch
parent78cf3e53b1f4ea6428925302d78f743a693d5fb1 (diff)
downloadupstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.tar.gz
upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.tar.bz2
upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.zip
kernel: bump 5.4 to 5.4.150
Manually rebased: generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch Removed upstreamed: layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch All others updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch')
-rw-r--r--target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch b/target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch
index f47ea95c95..3f92f8865b 100644
--- a/target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch
+++ b/target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch
@@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
clocks {
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
-@@ -330,14 +330,6 @@ static int bcma_register_devices(struct
+@@ -328,14 +328,6 @@ static int bcma_register_devices(struct
}
#endif
@@ -36,7 +36,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
#ifdef CONFIG_BCMA_NFLASH
if (bus->drv_cc.nflash.present) {
err = platform_device_register(&bcma_nflash_dev);
-@@ -415,6 +407,14 @@ int bcma_bus_register(struct bcma_bus *b
+@@ -413,6 +405,14 @@ int bcma_bus_register(struct bcma_bus *b
bcma_register_core(bus, core);
}