summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-10-28 10:29:21 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-10-28 10:29:21 +0100
commit766529fa2c95e2006ad4c4485c4cde0912d21f12 (patch)
treee132878cdc98927f9df4625d9a288ee8965fb562
parent7fca0aa489c82bef85514b5447f6a0be81543115 (diff)
downloadlinux-3.10-766529fa2c95e2006ad4c4485c4cde0912d21f12.tar.gz
linux-3.10-766529fa2c95e2006ad4c4485c4cde0912d21f12.tar.bz2
linux-3.10-766529fa2c95e2006ad4c4485c4cde0912d21f12.zip
[ARM] 2/4: Remove asm/hardware.h from asm-arm/arch-ebsa110/io.h
EBSA110 only requires hardware.h to be included for a couple of files. Move the include there. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-ebsa110/io.c1
-rw-r--r--drivers/net/arm/am79c961a.c1
-rw-r--r--include/asm-arm/arch-ebsa110/io.h2
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ebsa110/io.c b/arch/arm/mach-ebsa110/io.c
index ef7eb5dc91b..c648bfb676a 100644
--- a/arch/arm/mach-ebsa110/io.c
+++ b/arch/arm/mach-ebsa110/io.c
@@ -24,6 +24,7 @@
#include <linux/kernel.h>
#include <linux/types.h>
+#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/page.h>
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index c56d86d371a..3d50e953faa 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -29,6 +29,7 @@
#include <asm/system.h>
#include <asm/irq.h>
+#include <asm/hardware.h>
#include <asm/io.h>
#define TX_BUFFERS 15
diff --git a/include/asm-arm/arch-ebsa110/io.h b/include/asm-arm/arch-ebsa110/io.h
index ecf43363424..68e04c0bb3f 100644
--- a/include/asm-arm/arch-ebsa110/io.h
+++ b/include/asm-arm/arch-ebsa110/io.h
@@ -13,8 +13,6 @@
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
-#include <asm/hardware.h>
-
#define IO_SPACE_LIMIT 0xffff
u8 __inb8(unsigned int port);