Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

[karo-tx-linux.git] / arch / arm / mach-highbank / highbank.c

diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
index 93617d61f4b1fbd44043257fcdf8474577a34b97..40e36a50304c9bdb8994fc0e9ac91b5c06a44578 100644 (file)
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -201,6 +201,7 @@ static struct notifier_block highbank_platform_nb = {
 static void __init highbank_init(void)
 {
        pm_power_off = highbank_power_off;
+       highbank_pm_init();
 
        bus_register_notifier(&platform_bus_type, &highbank_platform_nb);
        bus_register_notifier(&amba_bustype, &highbank_amba_nb);
@@ -214,6 +215,7 @@ static const char *highbank_match[] __initconst = {
 };
 
 DT_MACHINE_START(HIGHBANK, "Highbank")
+       .smp            = smp_ops(highbank_smp_ops),
        .map_io         = highbank_map_io,
        .init_irq       = highbank_init_irq,
        .timer          = &highbank_timer,