diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2016-01-02 16:41:09 -0500 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-01-02 16:41:09 -0500 |
| commit | 49dea76aebab80e3500cdafa5c4f4b01ec8c9c08 (patch) | |
| tree | 6348e919762ae4c8844440deaf44141672d42746 /drivers/clk/rockchip/clk.h | |
| parent | 0b2e78865d92e2d70542cb1d4d7af1d4ea0a286d (diff) | |
| parent | 5b73840375e3eebeb7adf957ff64a96abdf4e1a1 (diff) | |
Merge branch 'clk-rockchip' into clk-next
Diffstat (limited to 'drivers/clk/rockchip/clk.h')
| -rw-r--r-- | drivers/clk/rockchip/clk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h index 3f71ee5d1bc9..ff8bd23a93ec 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h | |||
| @@ -424,7 +424,7 @@ struct rockchip_clk_branch { | |||
| 424 | .gate_offset = go, \ | 424 | .gate_offset = go, \ |
| 425 | .gate_shift = gs, \ | 425 | .gate_shift = gs, \ |
| 426 | .gate_flags = gf, \ | 426 | .gate_flags = gf, \ |
| 427 | .child = &(struct rockchip_clk_branch)ch, \ | 427 | .child = ch, \ |
| 428 | } | 428 | } |
| 429 | 429 | ||
| 430 | #define MUX(_id, cname, pnames, f, o, s, w, mf) \ | 430 | #define MUX(_id, cname, pnames, f, o, s, w, mf) \ |