summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-orion
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2009-04-22 20:08:17 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-04-23 23:25:41 +0100
commitfdd8b079e33d4711527ace19798e9db99a056469 (patch)
tree31c8f9d286dfb6fb8e7e306732cd51bea24d69a3 /arch/arm/plat-orion
parentae1036a2f4e8f83b544ddce4f875a1e4e2ac7b62 (diff)
downloadop-kernel-dev-fdd8b079e33d4711527ace19798e9db99a056469.zip
op-kernel-dev-fdd8b079e33d4711527ace19798e9db99a056469.tar.gz
[ARM] 5460/1: Orion: reduce namespace pollution
Symbols like SOFT_RESET are way too generic to be exported at large. To avoid this, let's move the mbus bridge register defines into a separate file and include it where needed. This affects mach-kirkwood, mach-loki, mach-mv78xx0 and mach-orion5x simultaneously as they all share code in plat-orion which relies on those defines. Some other defines have been moved to narrower scopes, or simply deleted when they had no user. This fixes compilation problem with mpt2sas on the above listed platforms. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-orion')
-rw-r--r--arch/arm/plat-orion/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c
index 6fa2923..bdeb166 100644
--- a/arch/arm/plat-orion/time.c
+++ b/arch/arm/plat-orion/time.c
@@ -16,7 +16,7 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/mach/time.h>
-#include <mach/hardware.h>
+#include <mach/bridge-regs.h>
/*
* Number of timer ticks per jiffy.
OpenPOWER on IntegriCloud