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 commit 'v2.6.28-rc2' into core/locking
[pandora-kernel.git]
/
arch
/
arm
/
mach-versatile
/
pci.c
diff --git
a/arch/arm/mach-versatile/pci.c
b/arch/arm/mach-versatile/pci.c
index
36f23f8
..
7161ba2
100644
(file)
--- a/
arch/arm/mach-versatile/pci.c
+++ b/
arch/arm/mach-versatile/pci.c
@@
-21,9
+21,9
@@
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/init.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/mach/pci.h>