Merge tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / arch / arm / mach-tegra / board-harmony.c

diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index 222182e002264de97fe3394079320c3502f22570..e65e837f40136bba659b5ce2ae3b640fc70e9a0b 100644 (file)
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -124,7 +124,6 @@ static struct platform_device *harmony_devices[] __initdata = {
        &tegra_ehci3_device,
        &tegra_i2s_device1,
        &tegra_das_device,
-       &tegra_pcm_device,
        &harmony_audio_device,
 };
 
@@ -193,5 +192,6 @@ MACHINE_START(HARMONY, "harmony")
        .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_harmony_init,
+       .init_late      = tegra_init_late,
        .restart        = tegra_assert_system_reset,
 MACHINE_END