From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 23 Aug 2011 09:54:51 +0000 (+0100)
Subject: Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
---

ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893
diff --cc arch/arm/mach-u300/include/mach/memory.h
index 38741da0d261,f98acd91abd3..7034bae95de6
--- a/arch/arm/mach-u300/include/mach/memory.h
+++ b/arch/arm/mach-u300/include/mach/memory.h
@@@ -28,10 -30,13 +30,8 @@@
  #define PLAT_PHYS_OFFSET (0x28000000 + \
  	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE +	\
  	     (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)
+ #define BOOT_PARAMS_OFFSET 0x100
  #endif
- #define BOOT_PARAMS_OFFSET (0x28000000 + \
- 	    (CONFIG_MACH_U300_ACCESS_MEM_SIZE +		\
- 	    (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024 + 0x100)
  #endif
  
 -/*
 - * We enable a real big DMA buffer if need be.
 - */
 -#define CONSISTENT_DMA_SIZE SZ_4M
 -
  #endif