From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 3 Jan 2012 21:22:31 +0000 (+0000)
Subject: Merge branch 'imx/board' into next/boards
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1fc3eb81100c3f3cd44e706e54390151b0f1ce74;p=linux-beck.git

Merge branch 'imx/board' into next/boards

* imx/board: (4 commits)
  Enable 32 bit flash support for iMX21ADS board
  ARM: mx31pdk: Add MC13783 RTC support
  iomux-mx25: configuration to support CSPI3 on CSI pins
  MX1:apf9328: Add i2c support

Updated to v3.2-rc6, conflicts:
	arch/arm/kernel/setup.c
---

1fc3eb81100c3f3cd44e706e54390151b0f1ce74
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;