summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-omap/entry-macro.S
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-03 15:03:02 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-03 15:03:02 +0200
commita8cac817764a494705aebd99fd51bdf6cdc28ec9 (patch)
tree202847337f42b188755a53a7b57b502a7cdc0ad3 /include/asm-arm/arch-omap/entry-macro.S
parentb4b3bd96f26586e53ab5482f1869221dd1b5ac36 (diff)
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff)
downloadkernel-crypto-a8cac817764a494705aebd99fd51bdf6cdc28ec9.tar.gz
kernel-crypto-a8cac817764a494705aebd99fd51bdf6cdc28ec9.tar.xz
kernel-crypto-a8cac817764a494705aebd99fd51bdf6cdc28ec9.zip
Merge commit 'v2.6.26-rc8' into x86/mce
Diffstat (limited to 'include/asm-arm/arch-omap/entry-macro.S')
-rw-r--r--include/asm-arm/arch-omap/entry-macro.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S
index 74cd57221c8..369093a45fc 100644
--- a/include/asm-arm/arch-omap/entry-macro.S
+++ b/include/asm-arm/arch-omap/entry-macro.S
@@ -8,6 +8,7 @@
* warranty of any kind, whether express or implied.
*/
#include <asm/hardware.h>
+#include <asm/arch/io.h>
#include <asm/arch/irqs.h>
#if defined(CONFIG_ARCH_OMAP1)