diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-15 01:02:28 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-15 01:02:28 +0200 |
commit | 1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (patch) | |
tree | 09fa867d9d9db6ed475eaa889da143603441e1a6 /arch/arm/mach-shmobile/board-mackerel.c | |
parent | Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into dev... (diff) | |
parent | ARM: zImage: prevent constant copy+rebuild of lib1funcs.S (diff) | |
download | linux-1db3706b05b11abcf2673ffbed5ad43b4c90ed11.tar.xz linux-1db3706b05b11abcf2673ffbed5ad43b4c90ed11.zip |
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) hdmi_init_pm_clock(); sh7372_pm_init(); pm_clk_add(&fsi_device.dev, "spu2"); + pm_clk_add(&hdmi_lcdc_device.dev, "hdmi"); } static void __init mackerel_timer_init(void) |