diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-20 13:05:59 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-20 13:05:59 -0500 |
| commit | 9838309b333bfb286d9e32b6a9aea8cc1dcbb537 (patch) | |
| tree | ff2044385cbbdc78cb2d96f64713ab04a10bec95 /arch/arm/mach-u300/include | |
| parent | 844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (diff) | |
| parent | bfd912c0dd119d98923494d0cbeee571df756b8a (diff) | |
Merge branch 'u300/cleanup' into next/cleanup
* u300/cleanup:
ARM: u300: delete memory.h
Diffstat (limited to 'arch/arm/mach-u300/include')
| -rw-r--r-- | arch/arm/mach-u300/include/mach/memory.h | 19 |
1 files changed, 0 insertions, 19 deletions
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 @@ | |||
| 1 | /* | ||
| 2 | * | ||
| 3 | * arch/arm/mach-u300/include/mach/memory.h | ||
| 4 | * | ||
| 5 | * | ||
| 6 | * Copyright (C) 2007-2009 ST-Ericsson AB | ||
| 7 | * License terms: GNU General Public License (GPL) version 2 | ||
| 8 | * Memory virtual/physical mapping constants. | ||
| 9 | * Author: Linus Walleij <linus.walleij@stericsson.com> | ||
| 10 | * Author: Jonas Aaberg <jonas.aberg@stericsson.com> | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __MACH_MEMORY_H | ||
| 14 | #define __MACH_MEMORY_H | ||
| 15 | |||
| 16 | #define PLAT_PHYS_OFFSET UL(0x48000000) | ||
| 17 | #define BOOT_PARAMS_OFFSET 0x100 | ||
| 18 | |||
| 19 | #endif | ||