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 'topic/hda' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
plat-orion
/
time.c
diff --git
a/arch/arm/plat-orion/time.c
b/arch/arm/plat-orion/time.c
index
2faf9db
..
de8a001
100644
(file)
--- a/
arch/arm/plat-orion/time.c
+++ b/
arch/arm/plat-orion/time.c
@@
-16,7
+16,7
@@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/mach/time.h>
-#include <mach/
hardware
.h>
+#include <mach/
bridge-regs
.h>
/*
* Number of timer ticks per jiffy.