diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-20 10:05:59 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-20 10:05:59 -0800 |
| commit | 9838309b333bfb286d9e32b6a9aea8cc1dcbb537 (patch) | |
| tree | ff2044385cbbdc78cb2d96f64713ab04a10bec95 | |
| parent | 844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (diff) | |
| parent | bfd912c0dd119d98923494d0cbeee571df756b8a (diff) | |
| download | kernel-common-9838309b333bfb286d9e32b6a9aea8cc1dcbb537.tar.gz kernel-common-9838309b333bfb286d9e32b6a9aea8cc1dcbb537.tar.bz2 kernel-common-9838309b333bfb286d9e32b6a9aea8cc1dcbb537.zip | |
Merge branch 'u300/cleanup' into next/cleanup
* u300/cleanup:
ARM: u300: delete memory.h
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-u300/include/mach/memory.h | 19 | ||||
| -rw-r--r-- | arch/arm/mach-u300/u300.c | 2 |
3 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0d961cb7be9a..540a6618084f 100644 --- 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 deleted file mode 100644 index c808f347a081..000000000000 --- a/arch/arm/mach-u300/include/mach/memory.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * - * arch/arm/mach-u300/include/mach/memory.h - * - * - * Copyright (C) 2007-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 - * Memory virtual/physical mapping constants. - * Author: Linus Walleij <linus.walleij@stericsson.com> - * Author: Jonas Aaberg <jonas.aberg@stericsson.com> - */ - -#ifndef __MACH_MEMORY_H -#define __MACH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(0x48000000) -#define BOOT_PARAMS_OFFSET 0x100 - -#endif diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c index 4a4fd334eb6e..5f0f7060f3a1 100644 --- 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, |