From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Sep 2011 02:06:25 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-soc/for-next'
X-Git-Tag: next-20110905~98
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9db129f74028ae6b0c4256a16e50321cfedd7251;p=karo-tx-linux.git

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	arch/arm/mach-u300/Makefile.boot
---

9db129f74028ae6b0c4256a16e50321cfedd7251
diff --cc arch/arm/mach-u300/Makefile.boot
index 69357affbd77,a06bb0deadfe..87811de0bd94
--- a/arch/arm/mach-u300/Makefile.boot
+++ b/arch/arm/mach-u300/Makefile.boot
@@@ -1,15 -1,4 +1,4 @@@
- # Note: the following conditions must always be true:
- #   ZRELADDR == virt_to_phys(TEXTADDR)
- #   PARAMS_PHYS must be within 4MB of ZRELADDR
- #   INITRD_PHYS must be in RAM
- 
- ifdef CONFIG_MACH_U300_SINGLE_RAM
-      zreladdr-y	+= 0x28E08000
-   params_phys-y	:= 0x28E00100
- else
-      zreladdr-y	+= 0x48008000
-   params_phys-y	:= 0x48000100
- endif
- 
 -   zreladdr-y	:= 0x48008000
++   zreladdr-y	+= 0x48008000
+ params_phys-y	:= 0x48000100
  # This isn't used.
- #initrd_phys-y	:= 0x29800000
+ #initrd_phys-y	:= 0x48800000