diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 21:26:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 21:26:37 +0100 |
| commit | 91fed558d0f33c74477569f50ed883fe6d430f1f (patch) | |
| tree | 84b32eb5f9b995efc21e39ee241fed38372d5f3b /arch/arm/include | |
| parent | Merge branch 'imx/fixes' into next/fixes (diff) | |
| parent | ARM: pxa/cm-x300: properly set bt_reset pin (diff) | |
| download | linux-91fed558d0f33c74477569f50ed883fe6d430f1f.tar.xz linux-91fed558d0f33c74477569f50ed883fe6d430f1f.zip | |
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/hardware/it8152.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/hardware/it8152.h b/arch/arm/include/asm/hardware/it8152.h index b3fea38d55c6..43cab498bc27 100644 --- a/arch/arm/include/asm/hardware/it8152.h +++ b/arch/arm/include/asm/hardware/it8152.h @@ -9,7 +9,7 @@ #ifndef __ASM_HARDWARE_IT8152_H #define __ASM_HARDWARE_IT8152_H -extern unsigned long it8152_base_address; +extern void __iomem *it8152_base_address; #define IT8152_IO_BASE (it8152_base_address + 0x03e00000) #define IT8152_CFGREG_BASE (it8152_base_address + 0x03f00000) |