Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / arch / sh / kernel / cpu / sh4 / setup-sh7760.c

diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
index cd09733..7fbb7be 100644 (file)
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -164,7 +164,7 @@ static struct sh_timer_config tmu0_platform_data = {
        .name = "TMU0",
        .channel_offset = 0x04,
        .timer_bit = 0,
-       .clk = "module_clk",
+       .clk = "peripheral_clk",
        .clockevent_rating = 200,
 };
 
@@ -195,7 +195,7 @@ static struct sh_timer_config tmu1_platform_data = {
        .name = "TMU1",
        .channel_offset = 0x10,
        .timer_bit = 1,
-       .clk = "module_clk",
+       .clk = "peripheral_clk",
        .clocksource_rating = 200,
 };
 
@@ -226,7 +226,7 @@ static struct sh_timer_config tmu2_platform_data = {
        .name = "TMU2",
        .channel_offset = 0x1c,
        .timer_bit = 2,
-       .clk = "module_clk",
+       .clk = "peripheral_clk",
 };
 
 static struct resource tmu2_resources[] = {
@@ -265,7 +265,7 @@ static int __init sh7760_devices_setup(void)
        return platform_add_devices(sh7760_devices,
                                    ARRAY_SIZE(sh7760_devices));
 }
-__initcall(sh7760_devices_setup);
+arch_initcall(sh7760_devices_setup);
 
 static struct platform_device *sh7760_early_devices[] __initdata = {
        &tmu0_device,