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 git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
[pandora-kernel.git]
/
arch
/
arm
/
common
/
time-acorn.c
diff --git
a/arch/arm/common/time-acorn.c
b/arch/arm/common/time-acorn.c
index
df0983a
..
deeed56
100644
(file)
--- a/
arch/arm/common/time-acorn.c
+++ b/
arch/arm/common/time-acorn.c
@@
-17,9
+17,9
@@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/hardware/ioc.h>
#include <asm/mach/time.h>