summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-versatile/include/mach/system.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-12 15:05:39 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-12 15:05:39 +0200
commita9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch)
tree98304395fbb5b9c74fca35b196cd414c1949f280 /arch/arm/mach-versatile/include/mach/system.h
parenta8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff)
parentfd048088306656824958e7783ffcee27e241b361 (diff)
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/arm/mach-versatile/include/mach/system.h')
-rw-r--r--arch/arm/mach-versatile/include/mach/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/include/mach/system.h b/arch/arm/mach-versatile/include/mach/system.h
index 91fa559c7cc..c59e6100c7e 100644
--- a/arch/arm/mach-versatile/include/mach/system.h
+++ b/arch/arm/mach-versatile/include/mach/system.h
@@ -21,8 +21,8 @@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <mach/platform.h>
static inline void arch_idle(void)