summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-20 10:05:59 -0800
committerOlof Johansson <olof@lixom.net>2011-12-20 10:05:59 -0800
commit9838309b333bfb286d9e32b6a9aea8cc1dcbb537 (patch)
treeff2044385cbbdc78cb2d96f64713ab04a10bec95 /arch/arm/mach-u300
parent844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (diff)
parentbfd912c0dd119d98923494d0cbeee571df756b8a (diff)
downloadblackbird-op-linux-9838309b333bfb286d9e32b6a9aea8cc1dcbb537.tar.gz
blackbird-op-linux-9838309b333bfb286d9e32b6a9aea8cc1dcbb537.zip
Merge branch 'u300/cleanup' into next/cleanup
* u300/cleanup: ARM: u300: delete memory.h
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/include/mach/memory.h19
-rw-r--r--arch/arm/mach-u300/u300.c2
2 files changed, 1 insertions, 20 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 @@
-/*
- *
- * 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,
OpenPOWER on IntegriCloud