diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-06-15 14:21:04 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-06-15 14:26:41 +0200 |
| commit | 287303b0628b7b448cb7705b087ece7fbc5b97c3 (patch) | |
| tree | 8e74973039d5d30f61f1b25f9b3202ec0900f361 /target/linux/bcm27xx/patches-5.10/950-0181-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch | |
| parent | 920f2d92375de88151d8f836bdc778be85c7b552 (diff) | |
| download | upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.tar.gz upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.tar.bz2 upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.zip | |
kernel: bump 5.10 to 5.10.184
Manually rebased:
generic/pending-5.10/851-0004-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch
All other patches automatically rebased.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0181-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0181-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0181-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch b/target/linux/bcm27xx/patches-5.10/950-0181-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch index 0f07dd8d25..35a6b9c225 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0181-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0181-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch @@ -17,7 +17,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -@@ -2696,6 +2696,7 @@ vchiq_register_child(struct platform_dev +@@ -2698,6 +2698,7 @@ vchiq_register_child(struct platform_dev { struct platform_device_info pdevinfo; struct platform_device *child; @@ -25,7 +25,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> memset(&pdevinfo, 0, sizeof(pdevinfo)); -@@ -2711,10 +2712,20 @@ vchiq_register_child(struct platform_dev +@@ -2713,10 +2714,20 @@ vchiq_register_child(struct platform_dev } /* |