summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-pxa/system.h
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-07-15 21:19:14 +0200
committerBen Dooks <ben-linux@fluff.org>2008-07-15 21:19:14 +0200
commit0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch)
tree313b3b9ca04727f3704464e01d8dd97da1dd534b /include/asm-arm/arch-pxa/system.h
parent[ARM] S3C24XX: Fix SERIAL_SAMSUNG entry (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff)
downloadlinux-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.tar.xz
linux-0c17e4ceedd35c78b1c7413dbd16279a350be6bc.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'include/asm-arm/arch-pxa/system.h')
-rw-r--r--include/asm-arm/arch-pxa/system.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/system.h b/include/asm-arm/arch-pxa/system.h
index 9aa6c2e939e8..ba7e132de1b3 100644
--- a/include/asm-arm/arch-pxa/system.h
+++ b/include/asm-arm/arch-pxa/system.h
@@ -12,6 +12,7 @@
#include <asm/proc-fns.h>
#include "hardware.h"
+#include "pxa2xx-regs.h"
#include "pxa-regs.h"
static inline void arch_idle(void)