From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Jun 2013 20:09:04 +0000 (+0200)
Subject: Merge branch 'next/cleanup' into for-next
X-Git-Tag: next-20130628~18^2~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=282791bfea74ce50825ece604de83eb01f2810ba;p=karo-tx-linux.git

Merge branch 'next/cleanup' into for-next
---

282791bfea74ce50825ece604de83eb01f2810ba
diff --cc arch/arm/mach-prima2/common.c
index e588c2152133,a9f475cdf603..2c70f74fed5d
--- a/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 a67d2dd5bb60,bdf05f41ca90..b184e57d1854
--- a/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