aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
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
commitb590bc5cd0ced1019f02ca7c9b8594482304987f (patch)
tree381df16e64f65ef0ae604f39fc8f0f26baa7bdb6 /arch/arm
parentda14d88e90d476b315e5e9c3e3ffa940cb670c6d (diff)
Orion: move I/O macros out of orion.h
Move the Orion register accessor macros out of orion.h, to prevent them from ending up in the decompressor image (Orion uncompress.h includes orion.h.) Move them into io.h, which seems a better place for this kind of stuff. 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 'arch/arm')
-rw-r--r--arch/arm/mach-orion/addr-map.c1
-rw-r--r--arch/arm/mach-orion/gpio.c1
-rw-r--r--arch/arm/mach-orion/irq.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-orion/addr-map.c b/arch/arm/mach-orion/addr-map.c
index ca641db6214d..ecca987b57e9 100644
--- a/arch/arm/mach-orion/addr-map.c
+++ b/arch/arm/mach-orion/addr-map.c
@@ -14,6 +14,7 @@
14#include <linux/init.h> 14#include <linux/init.h>
15#include <linux/mbus.h> 15#include <linux/mbus.h>
16#include <asm/hardware.h> 16#include <asm/hardware.h>
17#include <asm/io.h>
17#include "common.h" 18#include "common.h"
18 19
19/* 20/*
diff --git a/arch/arm/mach-orion/gpio.c b/arch/arm/mach-orion/gpio.c
index f713818c66a3..5a7d9cc9b800 100644
--- a/arch/arm/mach-orion/gpio.c
+++ b/arch/arm/mach-orion/gpio.c
@@ -16,6 +16,7 @@
16#include <linux/spinlock.h> 16#include <linux/spinlock.h>
17#include <linux/bitops.h> 17#include <linux/bitops.h>
18#include <asm/gpio.h> 18#include <asm/gpio.h>
19#include <asm/io.h>
19#include <asm/arch/orion.h> 20#include <asm/arch/orion.h>
20#include "common.h" 21#include "common.h"
21 22
diff --git a/arch/arm/mach-orion/irq.c b/arch/arm/mach-orion/irq.c
index 855793afcca8..dc8cb15a817f 100644
--- a/arch/arm/mach-orion/irq.c
+++ b/arch/arm/mach-orion/irq.c
@@ -14,6 +14,7 @@
14#include <linux/init.h> 14#include <linux/init.h>
15#include <linux/irq.h> 15#include <linux/irq.h>
16#include <asm/gpio.h> 16#include <asm/gpio.h>
17#include <asm/io.h>
17#include <asm/arch/orion.h> 18#include <asm/arch/orion.h>
18#include <asm/plat-orion/irq.h> 19#include <asm/plat-orion/irq.h>
19#include "common.h" 20#include "common.h"