aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0170-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2023-06-15 14:21:04 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2023-06-15 14:26:41 +0200
commit287303b0628b7b448cb7705b087ece7fbc5b97c3 (patch)
tree8e74973039d5d30f61f1b25f9b3202ec0900f361 /target/linux/bcm27xx/patches-5.10/950-0170-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
parent920f2d92375de88151d8f836bdc778be85c7b552 (diff)
downloadupstream-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-0170-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0170-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0170-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch b/target/linux/bcm27xx/patches-5.10/950-0170-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
index 76e81fda43..b9c2c4b400 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0170-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0170-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
@@ -22,7 +22,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
static struct vchiq_drvdata bcm2835_drvdata = {
.cache_line_size = 32,
-@@ -2765,6 +2766,7 @@ static int vchiq_probe(struct platform_d
+@@ -2767,6 +2768,7 @@ static int vchiq_probe(struct platform_d
VCHIQ_VERSION, VCHIQ_VERSION_MIN,
MAJOR(vchiq_devid), MINOR(vchiq_devid));
@@ -30,7 +30,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
-@@ -2781,6 +2783,7 @@ static int vchiq_remove(struct platform_
+@@ -2783,6 +2785,7 @@ static int vchiq_remove(struct platform_
{
platform_device_unregister(bcm2835_audio);
platform_device_unregister(bcm2835_camera);