Skip to content

Commit 4088a0e

Browse files
rpardiniigorpecovnik
authored andcommitted
uefi-arm64-6.17: rebase against v6.17
1 parent 4aadf67 commit 4088a0e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

patch/kernel/archive/uefi-arm64-6.17/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ index 111111111111..222222222222 100644
368368
#include <linux/platform_device.h>
369369
#include <linux/pm_runtime.h>
370370
#include <linux/module.h>
371-
@@ -727,6 +730,249 @@ struct clk *stmmac_pltfr_find_clk(struct plat_stmmacenet_data *plat_dat,
371+
@@ -730,6 +733,249 @@ struct clk *stmmac_pltfr_find_clk(struct plat_stmmacenet_data *plat_dat,
372372
}
373373
EXPORT_SYMBOL_GPL(stmmac_pltfr_find_clk);
374374

@@ -618,7 +618,7 @@ index 111111111111..222222222222 100644
618618
int stmmac_get_platform_resources(struct platform_device *pdev,
619619
struct stmmac_resources *stmmac_res)
620620
{
621-
@@ -734,8 +980,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
621+
@@ -737,8 +983,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
622622

623623
/* Get IRQ information early to have an ability to ask for deferred
624624
* probe if needed before we went too far with resource allocation.
@@ -634,7 +634,7 @@ index 111111111111..222222222222 100644
634634
if (stmmac_res->irq < 0)
635635
return stmmac_res->irq;
636636

637-
@@ -753,6 +1005,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
637+
@@ -756,6 +1008,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
638638
return -EPROBE_DEFER;
639639
dev_info(&pdev->dev, "IRQ eth_wake_irq not found\n");
640640
stmmac_res->wol_irq = stmmac_res->irq;

0 commit comments

Comments
 (0)