git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/fpu' into x86/urgent
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
at91rm9200_time.c
diff --git
a/arch/arm/mach-at91/at91rm9200_time.c
b/arch/arm/mach-at91/at91rm9200_time.c
index
50392ff
..
a72e798
100644
(file)
--- a/
arch/arm/mach-at91/at91rm9200_time.c
+++ b/
arch/arm/mach-at91/at91rm9200_time.c
@@
-26,7
+26,7
@@
#include <asm/mach/time.h>
-#include <
asm/ar
ch/at91_st.h>
+#include <
ma
ch/at91_st.h>
static unsigned long last_crtr;
static u32 irqmask;