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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
blackfin
/
kernel
/
gptimers.c
diff --git
a/arch/blackfin/kernel/gptimers.c
b/arch/blackfin/kernel/gptimers.c
index
e698554
..
3a3e961
100644
(file)
--- a/
arch/blackfin/kernel/gptimers.c
+++ b/
arch/blackfin/kernel/gptimers.c
@@
-10,8
+10,8
@@
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/io.h>
-#include <asm/io.h>
#include <asm/blackfin.h>
#include <asm/gptimers.h>