diff options
author | Greg Ungerer <gerg@snapgear.com> | 2007-07-25 08:07:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 14:05:01 -0400 |
commit | 020f9e16c306f929382ad81e5a0ecf4f41887616 (patch) | |
tree | 87a0fe6a9dd6ba0a76826f26fed562fe2d286a3c | |
parent | 906a2621fc14005ac6e29a2b85aa8685b68bb016 (diff) |
m68knommu: fix reset register address casting
Fix types used for reset register address setup.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/asm-m68knommu/system.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h index 5e5ed18bb78f..5da43a5d12a3 100644 --- a/include/asm-m68knommu/system.h +++ b/include/asm-m68knommu/system.h | |||
@@ -296,7 +296,7 @@ cmpxchg(volatile int *p, int old, int new) | |||
296 | ({ \ | 296 | ({ \ |
297 | unsigned char volatile *reset; \ | 297 | unsigned char volatile *reset; \ |
298 | asm("move.w #0x2700, %sr"); \ | 298 | asm("move.w #0x2700, %sr"); \ |
299 | reset = ((volatile unsigned short *)(MCF_IPSBAR + 0x110000)); \ | 299 | reset = ((volatile unsigned char *)(MCF_IPSBAR + 0x110000)); \ |
300 | while(1) \ | 300 | while(1) \ |
301 | *reset |= (0x01 << 7);\ | 301 | *reset |= (0x01 << 7);\ |
302 | }) | 302 | }) |
@@ -318,7 +318,7 @@ cmpxchg(volatile int *p, int old, int new) | |||
318 | ({ \ | 318 | ({ \ |
319 | unsigned char volatile *reset; \ | 319 | unsigned char volatile *reset; \ |
320 | asm("move.w #0x2700, %sr"); \ | 320 | asm("move.w #0x2700, %sr"); \ |
321 | reset = ((volatile unsigned short *)(MCF_IPSBAR + 0xA0000)); \ | 321 | reset = ((volatile unsigned char *)(MCF_IPSBAR + 0xA0000)); \ |
322 | while(1) \ | 322 | while(1) \ |
323 | *reset |= 0x80; \ | 323 | *reset |= 0x80; \ |
324 | }) | 324 | }) |