* linux-next: manual merge of the akpm tree with the clk tree
@ 2014-09-30 9:37 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-09-30 9:37 UTC (permalink / raw)
To: Andrew Morton, Mike Turquette
Cc: linux-next, linux-kernel, Heiko Stübner
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/clk/rockchip/clk.h between commit f6fba5f6967d ("clk: rockchip:
add new clock-type for the cpuclk") from the clk tree and commit "clk:
rockchip: add restart handler" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/clk/rockchip/clk.h
index f4791fbb3da9,2f0236a00664..000000000000
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@@ -361,11 -329,7 +361,12 @@@ void rockchip_clk_register_branches(str
unsigned int nr_clk);
void rockchip_clk_register_plls(struct rockchip_pll_clock *pll_list,
unsigned int nr_pll, int grf_lock_offset);
+void rockchip_clk_register_armclk(unsigned int lookup_id, const char *name,
+ const char **parent_names, u8 num_parents,
+ const struct rockchip_cpuclk_reg_data *reg_data,
+ const struct rockchip_cpuclk_rate_table *rates,
+ int nrates);
+ void rockchip_register_restart_notifier(unsigned int reg);
void rockchip_clk_protect_critical(const char *clocks[], int nclocks);
#define ROCKCHIP_SOFTRST_HIWORD_MASK BIT(0)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-30 9:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-30 9:37 linux-next: manual merge of the akpm tree with the clk tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox