commit febd86b969b975289ed948f1ac0eb9722da41ced
author Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Sun Nov 25 02:32:13 2007 +0900
committer Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Thu Nov 29 01:17:31 2007 +0900
tree c7f56683085967599cd55c20f7a139a14a53df73
parent 7fc792895be3c0edf423c4038992b40345672a12

sh: Update SuperH SCIF driver

- Changed volatile unsigned to vu_.
- Changed Makefile for kconfig.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

drivers/serial_sh.c

diff --git a/drivers/serial_sh.c b/drivers/serial_sh.c
index fca92fd..7818632 100644
--- a/drivers/serial_sh.c
+++ b/drivers/serial_sh.c
@@ -30,24 +30,24 @@
 #error "Default SCIF doesn't set....."
 #endif
 
-#define SCSMR 	(volatile unsigned short *)(SCIF_BASE + 0x0)
-#define SCBRR 	(volatile unsigned char  *)(SCIF_BASE + 0x4) 
-#define SCSCR 	(volatile unsigned short *)(SCIF_BASE + 0x8)
-#define SCFTDR 	(volatile unsigned char  *)(SCIF_BASE + 0xC)
-#define SCFSR 	(volatile unsigned short *)(SCIF_BASE + 0x10)
-#define SCFRDR 	(volatile unsigned char  *)(SCIF_BASE + 0x14)
-#define SCFCR 	(volatile unsigned short *)(SCIF_BASE + 0x18)
-#define SCFDR 	(volatile unsigned short *)(SCIF_BASE + 0x1C)
+#define SCSMR 	(vu_short *)(SCIF_BASE + 0x0)
+#define SCBRR 	(vu_char  *)(SCIF_BASE + 0x4) 
+#define SCSCR 	(vu_short *)(SCIF_BASE + 0x8)
+#define SCFTDR 	(vu_char  *)(SCIF_BASE + 0xC)
+#define SCFSR 	(vu_short *)(SCIF_BASE + 0x10)
+#define SCFRDR 	(vu_char  *)(SCIF_BASE + 0x14)
+#define SCFCR 	(vu_short *)(SCIF_BASE + 0x18)
+#define SCFDR 	(vu_short *)(SCIF_BASE + 0x1C)
 #if defined(CONFIG_SH4A)
-#define SCRFDR	(volatile unsigned short *)(SCIF_BASE + 0x20)
-#define SCSPTR	(volatile unsigned short *)(SCIF_BASE + 0x24)
-#define SCLSR   (volatile unsigned short *)(SCIF_BASE + 0x28)
-#define SCRER	(volatile unsigned short *)(SCIF_BASE + 0x2C)
+#define SCRFDR	(vu_short *)(SCIF_BASE + 0x20)
+#define SCSPTR	(vu_short *)(SCIF_BASE + 0x24)
+#define SCLSR   (vu_short *)(SCIF_BASE + 0x28)
+#define SCRER	(vu_short *)(SCIF_BASE + 0x2C)
 #elif defined (CONFIG_SH4)
-#define SCSPTR 	(volatile unsigned short *)(SCIF_BASE + 0x20)
-#define SCLSR 	(volatile unsigned short *)(SCIF_BASE + 0x24)
+#define SCSPTR 	(vu_short *)(SCIF_BASE + 0x20)
+#define SCLSR 	(vu_short *)(SCIF_BASE + 0x24)
 #elif defined (CONFIG_SH3)
-#define SCLSR 	(volatile unsigned short *)(SCIF_BASE + 0x24)
+#define SCLSR 	(vu_short *)(SCIF_BASE + 0x24)
 #endif
 
 #define SCR_RE 		(1 << 4)