diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:26:37 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:26:37 +0400 |
| commit | 91fed558d0f33c74477569f50ed883fe6d430f1f (patch) | |
| tree | 84b32eb5f9b995efc21e39ee241fed38372d5f3b /arch/arm/mach-pxa/cm-x2xx-pci.c | |
| parent | db1c5628eb8a321af7585e58019de99ccd2f28b2 (diff) | |
| parent | 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 (diff) | |
| download | linux-91fed558d0f33c74477569f50ed883fe6d430f1f.tar.xz | |
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/mach-pxa/cm-x2xx-pci.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x2xx-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c index 6bf479d9b5ac..ebd9259f5ac9 100644 --- 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) |