Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d4ac7aa authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-sh73a0-ccf2-for-v3.20' of... 

Merge tag 'renesas-sh73a0-ccf2-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Merge "Second Round of Renesas ARM Based SoC Sh73a0 CCF Updates for v3.20" from
Simon Horman:

Second Round of Renesas ARM Based SoC Sh73a0 CCF Updates for v3.20

* Fix sparse NULL pointer warning

* tag 'renesas-sh73a0-ccf2-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  clk: shmobile: fix sparse NULL pointer warning

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6b59907a 16bd794f

drivers/clk/shmobile/clk-sh73a0.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static struct div4_clk div4_clks[] = { 
	{ "m2", "pll1", CPG_FRQCRA,  0 },

	{ "zx", "pll1", CPG_FRQCRB, 12 },

	{ "hp", "pll1", CPG_FRQCRB,  4 },

	{ NULL, 0, 0, 0 },

	{ NULL, NULL, 0, 0 },

};



static const struct clk_div_table div4_div_table[] = {