diff --git a/[refs] b/[refs]
index 0ff52dd09461..5931205940ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90f46a5845596f0bf99f3a07dd4c7775dcbb40c4
+refs/heads/master: 6881761e63ac95fda3073443781ea928682fa600
diff --git a/trunk/drivers/serial/m32r_sio.h b/trunk/drivers/serial/m32r_sio.h
index 07d0dd80aa3d..7c3ec24f7e50 100644
--- a/trunk/drivers/serial/m32r_sio.h
+++ b/trunk/drivers/serial/m32r_sio.h
@@ -37,7 +37,7 @@ struct old_serial_port {
 	unsigned int irq;
 	unsigned int flags;
 	unsigned char io_type;
-	unsigned char *iomem_base;
+	unsigned char __iomem *iomem_base;
 	unsigned short iomem_reg_shift;
 };