diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 11:45:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 11:45:42 -0500 |
| commit | d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d (patch) | |
| tree | 092bf1f6cd50db2272d12ad6991ac3465f2d19ef /include/asm-arm/arch-realview/system.h | |
| parent | fbf0e1348ec4023675123d432ce1fdfa1eef8e54 (diff) | |
| parent | 5470dc656820fb67c0a2e352f0aaa48b86c19026 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-realview/system.h')
| -rw-r--r-- | include/asm-arm/arch-realview/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-realview/system.h b/include/asm-arm/arch-realview/system.h index 9f8fcbca086..6f3d0ce0ca1 100644 --- a/include/asm-arm/arch-realview/system.h +++ b/include/asm-arm/arch-realview/system.h | |||
| @@ -36,7 +36,7 @@ static inline void arch_idle(void) | |||
| 36 | 36 | ||
| 37 | static inline void arch_reset(char mode) | 37 | static inline void arch_reset(char mode) |
| 38 | { | 38 | { |
| 39 | unsigned int hdr_ctrl = (IO_ADDRESS(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET); | 39 | void __iomem *hdr_ctrl = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET; |
| 40 | unsigned int val; | 40 | unsigned int val; |
| 41 | 41 | ||
| 42 | /* | 42 | /* |