From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 3 Jan 2012 20:27:45 +0000 (+0000)
Subject: Merge branch 'v3.2-rc7' into next/pm
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72;p=linux-beck.git

Merge branch 'v3.2-rc7' into next/pm

Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
---

5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72
diff --cc arch/arm/kernel/setup.c
index 5c7094e8f6e9,8fc2c8fcbdc6..095d6611c84e
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -911,8 -902,14 +909,14 @@@ void __init setup_arch(char **cmdline_p
  	machine_desc = mdesc;
  	machine_name = mdesc->name;
  
+ #ifdef CONFIG_ZONE_DMA
+ 	if (mdesc->dma_zone_size) {
+ 		extern unsigned long arm_dma_zone_size;
+ 		arm_dma_zone_size = mdesc->dma_zone_size;
+ 	}
+ #endif
 -	if (mdesc->soft_reboot)
 -		reboot_setup("s");
 +	if (mdesc->restart_mode)
 +		reboot_setup(&mdesc->restart_mode);
  
  	init_mm.start_code = (unsigned long) _text;
  	init_mm.end_code   = (unsigned long) _etext;
diff --cc arch/arm/mach-shmobile/board-ag5evm.c
index 202c3c6ec9d8,7119b87cbfa0..f71fa3c13c8c
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@@ -607,8 -607,9 +607,9 @@@ struct sys_timer ag5evm_timer = 
  
  MACHINE_START(AG5EVM, "ag5evm")
  	.map_io		= ag5evm_map_io,
+ 	.nr_irqs	= NR_IRQS_LEGACY,
  	.init_irq	= sh73a0_init_irq,
 -	.handle_irq	= shmobile_handle_irq_gic,
 +	.handle_irq	= gic_handle_irq,
  	.init_machine	= ag5evm_init,
  	.timer		= &ag5evm_timer,
  MACHINE_END
diff --cc arch/arm/mach-shmobile/board-kota2.c
index 1b4439d3f9d5,f44150b5ae46..857ceeec1bb0
--- a/arch/arm/mach-shmobile/board-kota2.c
+++ b/arch/arm/mach-shmobile/board-kota2.c
@@@ -447,8 -549,9 +549,9 @@@ struct sys_timer kota2_timer = 
  
  MACHINE_START(KOTA2, "kota2")
  	.map_io		= kota2_map_io,
- 	.init_irq	= kota2_init_irq,
+ 	.nr_irqs	= NR_IRQS_LEGACY,
+ 	.init_irq	= sh73a0_init_irq,
 -	.handle_irq	= shmobile_handle_irq_gic,
 +	.handle_irq	= gic_handle_irq,
  	.init_machine	= kota2_init,
  	.timer		= &kota2_timer,
  MACHINE_END