From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 16 Sep 2011 20:45:16 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4722cd7741c6404f967f7a7b8b666540b6c1663e;p=linux-beck.git

Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable

Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c
---

4722cd7741c6404f967f7a7b8b666540b6c1663e
diff --cc arch/arm/mach-imx/mach-cpuimx27.c
index 881add0fbe5b,f851fe903687..b1ec2cf53bb0
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@@ -310,8 -310,8 +310,8 @@@ static struct sys_timer eukrea_cpuimx27
  	.init = eukrea_cpuimx27_timer_init,
  };
  
- MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")
+ MACHINE_START(EUKREA_CPUIMX27, "EUKREA CPUIMX27")
 -	.boot_params = MX27_PHYS_OFFSET + 0x100,
 +	.atag_offset = 0x100,
  	.map_io = mx27_map_io,
  	.init_early = imx27_init_early,
  	.init_irq = mx27_init_irq,
diff --cc arch/arm/mach-imx/mach-cpuimx35.c
index 10b89139da48,4bd083ba9af2..470b654b0e6e
--- a/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@@ -192,9 -192,9 +192,9 @@@ struct sys_timer eukrea_cpuimx35_timer 
  	.init	= eukrea_cpuimx35_timer_init,
  };
  
- MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
+ MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35")
  	/* Maintainer: Eukrea Electromatique */
 -	.boot_params = MX3x_PHYS_OFFSET + 0x100,
 +	.atag_offset = 0x100,
  	.map_io = mx35_map_io,
  	.init_early = imx35_init_early,
  	.init_irq = mx35_init_irq,
diff --cc arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index d8699b54268d,2442d5da883d..9163318e95a2
--- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@@ -161,9 -161,9 +161,9 @@@ static struct sys_timer eukrea_cpuimx25
  	.init   = eukrea_cpuimx25_timer_init,
  };
  
- MACHINE_START(EUKREA_CPUIMX25, "Eukrea CPUIMX25")
+ MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25")
  	/* Maintainer: Eukrea Electromatique */
 -	.boot_params = MX25_PHYS_OFFSET + 0x100,
 +	.atag_offset = 0x100,
  	.map_io = mx25_map_io,
  	.init_early = imx25_init_early,
  	.init_irq = mx25_init_irq,