diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
| commit | b6825d2df55aa7d7341c715b577b73a6a03dc944 (patch) | |
| tree | ae4f0f52f4c2ad4e501dd323318486ccdd7fcd93 /arch/arm/mach-omap2/cm.h | |
| parent | 6defd90433729c2d795865165cb34d938d8ff07c (diff) | |
| parent | aa59e19d05114f9fb7718d6bc8398255476fb4f5 (diff) | |
Merge branch 'omap-all' into devel
Conflicts:
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/irq.c
Diffstat (limited to 'arch/arm/mach-omap2/cm.h')
| -rw-r--r-- | arch/arm/mach-omap2/cm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h index 87a44c715aa4..65fdf78c91e1 100644 --- a/arch/arm/mach-omap2/cm.h +++ b/arch/arm/mach-omap2/cm.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #ifndef __ASSEMBLER__ | 19 | #ifndef __ASSEMBLER__ |
| 20 | #define OMAP_CM_REGADDR(module, reg) \ | 20 | #define OMAP_CM_REGADDR(module, reg) \ |
| 21 | (void __iomem *)IO_ADDRESS(OMAP2_CM_BASE + (module) + (reg)) | 21 | IO_ADDRESS(OMAP2_CM_BASE + (module) + (reg)) |
| 22 | #else | 22 | #else |
| 23 | #define OMAP2420_CM_REGADDR(module, reg) \ | 23 | #define OMAP2420_CM_REGADDR(module, reg) \ |
| 24 | IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg)) | 24 | IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg)) |