From 877eb74b4084df8daee30bf912bca841c5fad7a1 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@snapgear.com>
Date: Wed, 25 Jul 2007 22:07:20 +1000
Subject: [PATCH] --- yaml --- r: 62890 b: refs/heads/master c:
 020f9e16c306f929382ad81e5a0ecf4f41887616 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/include/asm-m68knommu/system.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5adaaf0f8076..230d8d1cf29d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 906a2621fc14005ac6e29a2b85aa8685b68bb016
+refs/heads/master: 020f9e16c306f929382ad81e5a0ecf4f41887616
diff --git a/trunk/include/asm-m68knommu/system.h b/trunk/include/asm-m68knommu/system.h
index 5e5ed18bb78f..5da43a5d12a3 100644
--- a/trunk/include/asm-m68knommu/system.h
+++ b/trunk/include/asm-m68knommu/system.h
@@ -296,7 +296,7 @@ cmpxchg(volatile int *p, int old, int new)
 ({						\
 	unsigned char volatile *reset;		\
 	asm("move.w	#0x2700, %sr");		\
-	reset = ((volatile unsigned short *)(MCF_IPSBAR + 0x110000));	\
+	reset = ((volatile unsigned char *)(MCF_IPSBAR + 0x110000));	\
 	while(1)				\
 	*reset |= (0x01 << 7);\
 })
@@ -318,7 +318,7 @@ cmpxchg(volatile int *p, int old, int new)
 ({					\
 	unsigned char volatile *reset;	\
 	asm("move.w     #0x2700, %sr");	\
-	reset = ((volatile unsigned short *)(MCF_IPSBAR + 0xA0000));	\
+	reset = ((volatile unsigned char *)(MCF_IPSBAR + 0xA0000));	\
 	while(1)			\
 		*reset |= 0x80;		\
 })