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

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

57446b98fb13e1ddf6cafef2bf7da2b60f178733
diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 3c7675a6a8f4,0c9a183131e2..28bbd56346a9
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@@ -249,9 -329,14 +249,9 @@@ static struct omap_hwmod_class am33xx_g
  };
  
  static struct omap_hwmod_rst_info am33xx_gfx_resets[] = {
- 	{ .name = "gfx", .rst_shift = 0 },
+ 	{ .name = "gfx", .rst_shift = 0, .st_shift = 0},
  };
  
 -static struct omap_hwmod_irq_info am33xx_gfx_irqs[] = {
 -	{ .name = "gfxint", .irq = 37 + OMAP_INTC_START, },
 -	{ .irq = -1 },
 -};
 -
  static struct omap_hwmod am33xx_gfx_hwmod = {
  	.name		= "gfx",
  	.class		= &am33xx_gfx_hwmod_class,
diff --cc arch/arm/mach-vexpress/v2m.c
index d6016970e2fe,b0eccf7e06ec..95a469e23e37
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@@ -455,8 -456,10 +455,9 @@@ static const char * const v2m_dt_match[
  DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
  	.dt_compat	= v2m_dt_match,
  	.smp		= smp_ops(vexpress_smp_ops),
+ 	.smp_init	= smp_init_ops(vexpress_smp_init_ops),
  	.map_io		= v2m_dt_map_io,
  	.init_early	= v2m_dt_init_early,
 -	.init_irq	= irqchip_init,
  	.init_time	= v2m_dt_timer_init,
  	.init_machine	= v2m_dt_init,
  MACHINE_END