diff --git a/[refs] b/[refs]
index cc28cae4e677..b5017cd73e01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e20cbcf199e2c3e4a4822e890726c49b70a4d280
+refs/heads/master: e08e02faff68d33c938fd0322c0f8318a25ddb39
diff --git a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.h b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.h
index e72c65b193ec..02a7c794db05 100644
--- a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.h
+++ b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.h
@@ -39,7 +39,7 @@
 
 /* Structure used to hold driver specific information */
 struct ca91cx42_driver {
-	void *base;	/* Base Address of device registers */
+	void __iomem *base;	/* Base Address of device registers */
 	wait_queue_head_t dma_queue;
 	wait_queue_head_t iack_queue;
 	wait_queue_head_t mbox_queue;