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://github.com/herbertx/crypto
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x2xx-pci.c
diff --git
a/arch/arm/mach-pxa/cm-x2xx-pci.c
b/arch/arm/mach-pxa/cm-x2xx-pci.c
index
6bf479d
..
ebd9259
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x2xx-pci.c
+++ b/
arch/arm/mach-pxa/cm-x2xx-pci.c
@@
-26,7
+26,7
@@
#include <asm/hardware/it8152.h>
-
unsigned long
it8152_base_address;
+
void __iomem *
it8152_base_address;
static int cmx2xx_it8152_irq_gpio;
static void cmx2xx_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)