Merge tag 'sunxi-fixes-for-3.8-rc4' of git://github.com/mripard/linux into fixes

[~andy/linux] / arch / arm / mach-pxa / himalaya.c

diff --git a/arch/arm/mach-pxa/himalaya.c b/arch/arm/mach-pxa/himalaya.c
index f2c324570844b189a3a16c286c0c705ecd344780..2962de898da9eefb0c1e35649e18468642b2abe4 100644 (file)
--- a/arch/arm/mach-pxa/himalaya.c
+++ b/arch/arm/mach-pxa/himalaya.c
@@ -160,8 +160,10 @@ static void __init himalaya_init(void)
 MACHINE_START(HIMALAYA, "HTC Himalaya")
        .atag_offset = 0x100,
        .map_io = pxa25x_map_io,
+       .nr_irqs = PXA_NR_IRQS,
        .init_irq = pxa25x_init_irq,
        .handle_irq = pxa25x_handle_irq,
        .init_machine = himalaya_init,
        .timer = &pxa_timer,
+       .restart        = pxa_restart,
 MACHINE_END