Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard...

[mv-sheeva.git] / drivers / staging / altpciechdma / altpciechdma.c

diff --git a/drivers/staging/altpciechdma/altpciechdma.c b/drivers/staging/altpciechdma/altpciechdma.c
index 3724b8ad48798a591e8aa0e19b2de214e544d1c6..e0c5ba4b4c2907abc0092795c35a4998bab04c41 100644 (file)
--- a/drivers/staging/altpciechdma/altpciechdma.c
+++ b/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);