Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...

[~andy/linux] / drivers / base / dma-coherent.c

diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
index d4d8ce53886aa8276165ef151aab2dca46b2ecac..f369e2795985a66d0e00c399464bef711acbf697 100644 (file)
--- a/drivers/base/dma-coherent.c
+++ b/drivers/base/dma-coherent.c
@@ -8,7 +8,7 @@
 
 struct dma_coherent_mem {
        void            *virt_base;
-       u32             device_base;
+       dma_addr_t      device_base;
        int             size;
        int             flags;
        unsigned long   *bitmap;