From 9469ce330d343c90064d5cc61e91ae82a6eceea5 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Mon, 20 Jan 2025 16:14:53 +0100 Subject: [PATCH] uefi-arm64-6.13: fix Phytium ACPI glue patch - seems upstream has gone `remove` -> `remove_new` and back to `remove` now --- ...hytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patch/kernel/archive/uefi-arm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch b/patch/kernel/archive/uefi-arm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch index e4de1488a6ad..bfe18c28557f 100644 --- a/patch/kernel/archive/uefi-arm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch +++ b/patch/kernel/archive/uefi-arm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch @@ -17,6 +17,7 @@ rpardini hammered: - fix stmmac acpi glue for Feiteng on 6.6.y - drop the (now-qcom) phy hibernate stuff as it landed by 6.12.y - rework stmmac_probe_config_acpi addition for 6.12.y +- rework for 6.13; remove_new is just remove again Signed-off-by: Ricardo Pardini --- @@ -330,7 +331,7 @@ index 000000000000..111111111111 + +static struct platform_driver dwmac_phytium_driver = { + .probe = dwmac_phytium_probe, -+ .remove_new = stmmac_pltfr_remove, ++ .remove = stmmac_pltfr_remove, + .driver = { + .name = "dwmac-phytium", + .pm = &stmmac_pltfr_pm_ops,