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-rmk' of git://gitorious.org/linux-gemini/mainline into devel
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
time.c
diff --git
a/arch/arm/mach-pxa/time.c
b/arch/arm/mach-pxa/time.c
index
95656a7
..
8eb3830
100644
(file)
--- a/
arch/arm/mach-pxa/time.c
+++ b/
arch/arm/mach-pxa/time.c
@@
-22,8
+22,7
@@
#include <asm/div64.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/div64.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
-#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
+#include <mach/regs-ost.h>
/*
* This is PXA's sched_clock implementation. This has a resolution
/*
* This is PXA's sched_clock implementation. This has a resolution