diff --git a/[refs] b/[refs]
index c0376714fb24..e4e165588ff3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f78bbd1a256e04dfb486dbee0430e0ecad6d960
+refs/heads/master: 251b9b0d403f61f507155697a459038b2ee3336c
diff --git a/trunk/include/linux/fsl-diu-fb.h b/trunk/include/linux/fsl-diu-fb.h
index 5ebffa69a0f6..35ac0c53975c 100644
--- a/trunk/include/linux/fsl-diu-fb.h
+++ b/trunk/include/linux/fsl-diu-fb.h
@@ -162,7 +162,7 @@ struct diu_hw {
 };
 
 struct diu_addr {
-	__u8 __iomem *vaddr;	/* Virtual address */
+	void *vaddr;		/* Virtual address */
 	dma_addr_t paddr;	/* Physical address */
 	__u32 	   offset;
 };