mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-22 22:54:06 +00:00
ed1536e0b6
Deleted (upstreamed): generic/backport-5.15/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch [1] Other patches automatically rebased. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.41&id=99858114a3b2c8f5f8707d9bbd46c50f547c87c0 Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
26 lines
775 B
Diff
26 lines
775 B
Diff
From 977d51f1d3f7058a4bcde2b3f6497880ccd5db6c Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Tue, 14 Dec 2021 21:53:18 +0000
|
|
Subject: [PATCH] drm/vc4: Fix build without DRM_VC4_HDMI_CEC
|
|
|
|
As reported by @asavah.
|
|
|
|
Fixes: https://github.com/raspberrypi/linux/issues/4771
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -2281,7 +2281,7 @@ static int vc4_hdmi_cec_init(struct vc4_
|
|
|
|
static void vc4_hdmi_cec_exit(struct vc4_hdmi *vc4_hdmi) {};
|
|
|
|
-static void vc4_hdmi_cec_resume(struct vc4_hdmi *vc4_hdmi)
|
|
+static int vc4_hdmi_cec_resume(struct vc4_hdmi *vc4_hdmi)
|
|
{
|
|
return 0;
|
|
}
|