aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-orion/orion.h
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-03-27 14:51:41 -0400
committerNicolas Pitre <nico@marvell.com>2008-03-27 14:51:41 -0400
commit159ffb3a04f6bc619643af680df406faafd0199d (patch)
tree45d76928836065a3207c15e5bc2037b186213ace /include/asm-arm/arch-orion/orion.h
parentOrion: enable access to local config space (diff)
downloadlinux-dev-159ffb3a04f6bc619643af680df406faafd0199d.tar.xz
linux-dev-159ffb3a04f6bc619643af680df406faafd0199d.zip
Orion: general cleanup
Various Orion cleanups: - Unify GPL license banner format across all files. - Unify naming of .h double inclusion guard preprocessor macros. - Unify spelling of "PCIe" (variants seen: PCIE, PCIe, PCI-EX.) - Various typo fixes. - Remove __init attributes from prototypes declared in headers. - Remove trailing comments from #endif statements. - Mark a couple of locally-used-only structs static. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Reviewed-by: Tzachi Perelstein <tzachi@marvell.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'include/asm-arm/arch-orion/orion.h')
-rw-r--r--include/asm-arm/arch-orion/orion.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-arm/arch-orion/orion.h b/include/asm-arm/arch-orion/orion.h
index d0b32c379ae4..01f1299472d1 100644
--- a/include/asm-arm/arch-orion/orion.h
+++ b/include/asm-arm/arch-orion/orion.h
@@ -11,8 +11,8 @@
* warranty of any kind, whether express or implied.
*/
-#ifndef __ASM_ARCH_ORION_H__
-#define __ASM_ARCH_ORION_H__
+#ifndef __ASM_ARCH_ORION_H
+#define __ASM_ARCH_ORION_H
/*****************************************************************************
* Orion Address Maps
@@ -91,6 +91,7 @@
#define ORION_BRIDGE_VIRT_BASE (ORION_REGS_VIRT_BASE | 0x20000)
#define ORION_BRIDGE_REG(x) (ORION_BRIDGE_VIRT_BASE | (x))
+#define TIMER_VIRT_BASE (ORION_BRIDGE_VIRT_BASE | 0x300)
#define ORION_PCI_VIRT_BASE (ORION_REGS_VIRT_BASE | 0x30000)
#define ORION_PCI_REG(x) (ORION_PCI_VIRT_BASE | (x))
@@ -154,7 +155,5 @@
#define MAIN_IRQ_CAUSE ORION_BRIDGE_REG(0x200)
#define MAIN_IRQ_MASK ORION_BRIDGE_REG(0x204)
-#define TIMER_VIRT_BASE (ORION_BRIDGE_VIRT_BASE | 0x300)
-
#endif