Merge branch 'next/cleanup' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/serial.c
Simple merge

diff --cc arch/arm/mach-omap2/usb-host.c
Simple merge

diff --cc arch/arm/mach-prima2/common.c
index e588c2152133231fbf77dd1a219d782e3d69d586,a9f475cdf603c92ad3f70de4b44817ce5ce59edf..2c70f74fed5dcfc7f0aa6c8d635691ca85a73502
--- 1/arch/arm/mach-prima2/common.c
--- 2/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@@ -45,8 -54,8 +44,7 @@@ DT_MACHINE_START(ATLAS6_DT, "Generic AT
        /* Maintainer: Barry Song <baohua.song@csr.com> */
        .nr_irqs        = 128,
        .map_io         = sirfsoc_map_io,
-       .init_irq       = irqchip_init,
        .init_time      = sirfsoc_init_time,
 -      .init_machine   = sirfsoc_mach_init,
        .init_late      = sirfsoc_init_late,
        .dt_compat      = atlas6_dt_match,
        .restart        = sirfsoc_restart,
@@@ -63,9 -72,9 +61,8 @@@ DT_MACHINE_START(PRIMA2_DT, "Generic PR
        /* Maintainer: Barry Song <baohua.song@csr.com> */
        .nr_irqs        = 128,
        .map_io         = sirfsoc_map_io,
-       .init_irq       = irqchip_init,
        .init_time      = sirfsoc_init_time,
        .dma_zone_size  = SZ_256M,
 -      .init_machine   = sirfsoc_mach_init,
        .init_late      = sirfsoc_init_late,
        .dt_compat      = prima2_dt_match,
        .restart        = sirfsoc_restart,
@@@ -82,8 -91,8 +79,7 @@@ DT_MACHINE_START(MARCO_DT, "Generic MAR
        /* Maintainer: Barry Song <baohua.song@csr.com> */
        .smp            = smp_ops(sirfsoc_smp_ops),
        .map_io         = sirfsoc_map_io,
-       .init_irq       = irqchip_init,
        .init_time      = sirfsoc_init_time,
 -      .init_machine   = sirfsoc_mach_init,
        .init_late      = sirfsoc_init_late,
        .dt_compat      = marco_dt_match,
        .restart        = sirfsoc_restart,

diff --cc arch/arm/mach-virt/virt.c
index a67d2dd5bb6062e7eede85ef612ac6c072c9e7ea,bdf05f41ca903141a34e30b1baa61a7e867a9fa4..b184e57d1854a552346aba0c985d060ce73775b2
--- 1/arch/arm/mach-virt/virt.c
--- 2/arch/arm/mach-virt/virt.c
+++ b/arch/arm/mach-virt/virt.c
@@@ -36,8 -35,10 +35,7 @@@ static const char *virt_dt_match[] = 
        NULL
  };
  
 -extern struct smp_operations virt_smp_ops;
 -
  DT_MACHINE_START(VIRT, "Dummy Virtual Machine")
-       .init_irq       = irqchip_init,
        .init_machine   = virt_init,
 -      .smp            = smp_ops(virt_smp_ops),
        .dt_compat      = virt_dt_match,
  MACHINE_END