aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0221-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.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-0221-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.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-0221-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0221-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0221-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch b/target/linux/bcm27xx/patches-5.10/950-0221-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
index e621e74073..bd671a1d8f 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0221-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0221-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
@@ -21,7 +21,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
static struct vchiq_drvdata bcm2835_drvdata = {
.cache_line_size = 32,
-@@ -2796,6 +2797,7 @@ static int vchiq_probe(struct platform_d
+@@ -2798,6 +2799,7 @@ static int vchiq_probe(struct platform_d
bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec");
bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
@@ -29,7 +29,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
return 0;
-@@ -2808,6 +2810,7 @@ failed_platform_init:
+@@ -2810,6 +2812,7 @@ failed_platform_init:
static int vchiq_remove(struct platform_device *pdev)
{