diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-21 14:57:04 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-21 14:57:04 -0800 |
| commit | 4d4ac7aa901d43314a7642e3039be4daeb7657ba (patch) | |
| tree | adb3566b90069ca4704f460936aecbd4236bb091 | |
| parent | 6b59907abc96f2625c0befec09da69e813cef0df (diff) | |
| parent | 16bd794f9432b556ec797cbf16c5e575a18f7030 (diff) | |
| download | op-kernel-dev-4d4ac7aa901d43314a7642e3039be4daeb7657ba.zip op-kernel-dev-4d4ac7aa901d43314a7642e3039be4daeb7657ba.tar.gz | |
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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/clk/shmobile/clk-sh73a0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/shmobile/clk-sh73a0.c b/drivers/clk/shmobile/clk-sh73a0.c index 8574a6d..cd529cf 100644 --- a/drivers/clk/shmobile/clk-sh73a0.c +++ b/drivers/clk/shmobile/clk-sh73a0.c @@ -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[] = { |
