diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2016-06-29 14:41:43 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2016-06-29 14:41:43 +0200 |
| commit | f0aa411de83c096e09cf46b9ea0d68a1eeab4863 (patch) | |
| tree | 15b696af2c76f49abb9f02cb064f1b55e83cc7e5 /include/linux | |
| parent | c94bc815f3c757df402d6f6a3e8d855b9168e6af (diff) | |
| parent | ced42730d19dd140a76f86c3761f646b83a35d09 (diff) | |
| download | cachepc-linux-f0aa411de83c096e09cf46b9ea0d68a1eeab4863.tar.gz cachepc-linux-f0aa411de83c096e09cf46b9ea0d68a1eeab4863.zip | |
Merge branch 'rcar-sysc-for-v4.8' into HEAD
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/soc/renesas/rcar-sysc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/soc/renesas/rcar-sysc.h b/include/linux/soc/renesas/rcar-sysc.h index 92fc613ab23d..7b8b280c181b 100644 --- a/include/linux/soc/renesas/rcar-sysc.h +++ b/include/linux/soc/renesas/rcar-sysc.h @@ -11,6 +11,6 @@ struct rcar_sysc_ch { int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch); int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch); -void __iomem *rcar_sysc_init(phys_addr_t base); +void rcar_sysc_init(phys_addr_t base, u32 syscier); #endif /* __LINUX_SOC_RENESAS_RCAR_SYSC_H__ */ |