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 'for-linus' of git://neil.brown.name/md
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
timex.h
diff --git
a/arch/arm/include/asm/timex.h
b/arch/arm/include/asm/timex.h
index
e50e292
..
3be8de3
100644
(file)
--- a/
arch/arm/include/asm/timex.h
+++ b/
arch/arm/include/asm/timex.h
@@
-12,7
+12,7
@@
#ifndef _ASMARM_TIMEX_H
#define _ASMARM_TIMEX_H
-#include <
asm/ar
ch/timex.h>
+#include <
ma
ch/timex.h>
typedef unsigned long cycles_t;