From: Olof Johansson <olof@lixom.net>
Date: Tue, 20 Dec 2011 18:05:59 +0000 (-0800)
Subject: Merge branch 'u300/cleanup' into next/cleanup
X-Git-Tag: v3.3-rc1~144^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9838309b333bfb286d9e32b6a9aea8cc1dcbb537;p=linux.git

Merge branch 'u300/cleanup' into next/cleanup

* u300/cleanup:
  ARM: u300: delete memory.h
---

9838309b333bfb286d9e32b6a9aea8cc1dcbb537
diff --cc arch/arm/mach-u300/u300.c
index 4a4fd334eb6e,b200312345c5..5f0f7060f3a1
--- a/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@@ -47,10 -46,9 +47,10 @@@ static void __init u300_init_machine(vo
  
  MACHINE_START(U300, MACH_U300_STRING)
  	/* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
- 	.atag_offset	= BOOT_PARAMS_OFFSET,
+ 	.atag_offset	= 0x100,
  	.map_io		= u300_map_io,
  	.init_irq	= u300_init_irq,
 +	.handle_irq	= vic_handle_irq,
  	.timer		= &u300_timer,
  	.init_machine	= u300_init_machine,
  MACHINE_END