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

[mv-sheeva.git] / arch / powerpc / include / asm / types.h

diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h
index c646f34c4e8b5879d1c4c4922b40bf43191f0445..c004c13f291e771fa63a6f842094b3faacee7037 100644 (file)
--- a/arch/powerpc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
@@ -48,7 +48,7 @@ typedef struct {
 
 typedef __vector128 vector128;
 
-#ifdef __powerpc64__
+#if defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)
 typedef u64 dma_addr_t;
 #else
 typedef u32 dma_addr_t;