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-2.6.30' into for-2.6.31
[pandora-kernel.git]
/
lib
/
ioremap.c
diff --git
a/lib/ioremap.c
b/lib/ioremap.c
index
a9e4415
..
14c6078
100644
(file)
--- a/
lib/ioremap.c
+++ b/
lib/ioremap.c
@@
-7,7
+7,8
@@
*/
#include <linux/vmalloc.h>
#include <linux/mm.h>
-
+#include <linux/sched.h>
+#include <linux/io.h>
#include <asm/cacheflush.h>
#include <asm/pgtable.h>