diff --git a/[refs] b/[refs]
index 37cba7e56cb5..ddc845d64cb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fdec57610309f2cf67a8c0a82d262045bcd8c41
+refs/heads/master: 9cfa2bc2f455aa9ba1b7bd92eb6790d78c8fab4a
diff --git a/trunk/drivers/staging/altpciechdma/altpciechdma.c b/trunk/drivers/staging/altpciechdma/altpciechdma.c
index 3724b8ad4879..e0c5ba4b4c29 100644
--- a/trunk/drivers/staging/altpciechdma/altpciechdma.c
+++ b/trunk/drivers/staging/altpciechdma/altpciechdma.c
@@ -550,7 +550,7 @@ static int __devinit dma_test(struct ape_dev *ape, struct pci_dev *dev)
 #if 0
 		*(u32 *)(buffer_virt + i) = i / PAGE_SIZE + 1;
 #else
-		*(u32 *)(buffer_virt + i) = (buffer_virt + i);
+		*(u32 *)(buffer_virt + i) = (u32)(unsigned long)(buffer_virt + i);
 #endif
 #if 0
   compare((u32 *)buffer_virt, (u32 *)(buffer_virt + 2 * PAGE_SIZE), 8192);