Merge branch 'u300/cleanup' into next/cleanup

* u300/cleanup: ARM: u300: delete memory.h
git-mirror · Dec 20, 2011 · 9838309 · 9838309
2 parents 844e8a1 + bfd912c
commit 9838309
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -893,7 +893,6 @@ config ARCH_U300
 	select HAVE_MACH_CLKDEV
 	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
-	select NEED_MACH_MEMORY_H
 	help
 	  Support for ST-Ericsson U300 series mobile platforms.
 

diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h
diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c
@@ -47,7 +47,7 @@ static void __init u300_init_machine(void)
 
 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,