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 'fix/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
at91x40_time.c
diff --git
a/arch/arm/mach-at91/at91x40_time.c
b/arch/arm/mach-at91/at91x40_time.c
index
869b5e2
..
dfff289
100644
(file)
--- a/
arch/arm/mach-at91/at91x40_time.c
+++ b/
arch/arm/mach-at91/at91x40_time.c
@@
-23,8
+23,8
@@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/time.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/mach/time.h>
#include <mach/at91_tc.h>