diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-04-22 15:08:17 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-23 18:25:41 -0400 |
| commit | fdd8b079e33d4711527ace19798e9db99a056469 (patch) | |
| tree | 31c8f9d286dfb6fb8e7e306732cd51bea24d69a3 /arch/arm/mach-orion5x/include/mach/system.h | |
| parent | ae1036a2f4e8f83b544ddce4f875a1e4e2ac7b62 (diff) | |
[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/mach-orion5x/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/system.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/include/mach/system.h b/arch/arm/mach-orion5x/include/mach/system.h index 9b8db1dcfa8..e912490fff2 100644 --- a/arch/arm/mach-orion5x/include/mach/system.h +++ b/arch/arm/mach-orion5x/include/mach/system.h | |||
| @@ -11,8 +11,7 @@ | |||
| 11 | #ifndef __ASM_ARCH_SYSTEM_H | 11 | #ifndef __ASM_ARCH_SYSTEM_H |
| 12 | #define __ASM_ARCH_SYSTEM_H | 12 | #define __ASM_ARCH_SYSTEM_H |
| 13 | 13 | ||
| 14 | #include <mach/hardware.h> | 14 | #include <mach/bridge-regs.h> |
| 15 | #include <mach/orion5x.h> | ||
| 16 | 15 | ||
| 17 | static inline void arch_idle(void) | 16 | static inline void arch_idle(void) |
| 18 | { | 17 | { |