diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-14 19:02:28 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-14 19:02:28 -0400 |
| commit | 1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (patch) | |
| tree | 09fa867d9d9db6ed475eaa889da143603441e1a6 /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (diff) | |
| parent | 63d15148b6058ab0037343390e8918503ed81968 (diff) | |
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 671925dcf5f9..e7c5379069ef 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
| @@ -1591,6 +1591,7 @@ static void __init mackerel_init(void) | |||
| 1591 | hdmi_init_pm_clock(); | 1591 | hdmi_init_pm_clock(); |
| 1592 | sh7372_pm_init(); | 1592 | sh7372_pm_init(); |
| 1593 | pm_clk_add(&fsi_device.dev, "spu2"); | 1593 | pm_clk_add(&fsi_device.dev, "spu2"); |
| 1594 | pm_clk_add(&hdmi_lcdc_device.dev, "hdmi"); | ||
| 1594 | } | 1595 | } |
| 1595 | 1596 | ||
| 1596 | static void __init mackerel_timer_init(void) | 1597 | static void __init mackerel_timer_init(void) |