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

[pandora-kernel.git] / arch / m68k / include / asm / scatterlist.h

diff --git a/arch/m68k/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist.h
index d3a7a0e..e27ad90 100644 (file)
--- a/arch/m68k/include/asm/scatterlist.h
+++ b/arch/m68k/include/asm/scatterlist.h
@@ -11,7 +11,7 @@ struct scatterlist {
        unsigned int offset;
        unsigned int length;
 
-       __u32 dma_address;      /* A place to hang host-specific addresses at. */
+       dma_addr_t dma_address; /* A place to hang host-specific addresses at. */
 };
 
 /* This is bogus and should go away. */