Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Russell King [Tue, 23 Aug 2011 09:54:51 +0000 (10:54 +0100)]
1  2 
arch/arm/mach-u300/include/mach/memory.h

  #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