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 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ks8695
/
time.c
diff --git
a/arch/arm/mach-ks8695/time.c
b/arch/arm/mach-ks8695/time.c
index
02f766b
..
940888d
100644
(file)
--- a/
arch/arm/mach-ks8695/time.c
+++ b/
arch/arm/mach-ks8695/time.c
@@
-28,8
+28,8
@@
#include <asm/io.h>
#include <asm/mach/time.h>
-#include <
asm/ar
ch/regs-timer.h>
-#include <
asm/ar
ch/regs-irq.h>
+#include <
ma
ch/regs-timer.h>
+#include <
ma
ch/regs-irq.h>
#include "generic.h"