diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-12-10 18:59:21 +0100 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-12-10 18:59:21 +0100 |
commit | 8e1c9f59442dd4fc80914c224dfd032ca2c284d2 (patch) | |
tree | 69f03f96ca80c34ff251225e13390de5cbf71b24 /arch/arm/mach-shmobile/clock-r8a7790.c | |
parent | Merge tag 'mvebu-dt-3.14-2' of git://git.infradead.org/linux-mvebu into next/dt (diff) | |
parent | Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/c... (diff) | |
download | linux-8e1c9f59442dd4fc80914c224dfd032ca2c284d2.tar.xz linux-8e1c9f59442dd4fc80914c224dfd032ca2c284d2.zip |
Merge branch 'next/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-shmobile/clock-r8a7790.c')
-rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7790.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c index a64f965c7da1..fa1b4773677a 100644 --- a/arch/arm/mach-shmobile/clock-r8a7790.c +++ b/arch/arm/mach-shmobile/clock-r8a7790.c @@ -77,7 +77,7 @@ static struct sh_clk_ops followparent_clk_ops = { }; static struct clk main_clk = { - /* .parent will be set r8a73a4_clock_init */ + /* .parent will be set r8a7790_clock_init */ .ops = &followparent_clk_ops, }; |