From: Hauke Mehrtens Date: Thu, 23 Mar 2023 23:41:14 +0000 (+0100) Subject: ipq806x: Refresh patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=93debecc887a0d27bcef8f41915c2739ab348d80;p=openwrt%2Fstaging%2Fblocktrron.git ipq806x: Refresh patches Make the patches apply cleanly again. Fixes: a97965b7b11f ("kernel: add pending patches for bcm63268-timer-clocks") Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/ipq806x/patches-5.15/118-v6.1-03-clk-introduce-devm_-hw_register_mux_parent_data_tabl.patch b/target/linux/ipq806x/patches-5.15/118-v6.1-03-clk-introduce-devm_-hw_register_mux_parent_data_tabl.patch index a15a723029..8567d0802b 100644 --- a/target/linux/ipq806x/patches-5.15/118-v6.1-03-clk-introduce-devm_-hw_register_mux_parent_data_tabl.patch +++ b/target/linux/ipq806x/patches-5.15/118-v6.1-03-clk-introduce-devm_-hw_register_mux_parent_data_tabl.patch @@ -17,7 +17,7 @@ Signed-off-by: Christian Marangi --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h -@@ -932,12 +932,26 @@ struct clk *clk_register_mux_table(struc +@@ -955,12 +955,26 @@ struct clk *clk_register_mux_table(struc __clk_hw_register_mux((dev), NULL, (name), (num_parents), NULL, NULL, \ (parent_data), (flags), (reg), (shift), \ BIT((width)) - 1, (clk_mux_flags), NULL, (lock))