[ACPI] ACPICA 20051117

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / types.h

diff --git a/include/asm-powerpc/types.h b/include/asm-powerpc/types.h
index 7d803cb547bba26f01f1f089bf081472baa2a169..ec3c2ee8bf86e7a52e59e6531904b881cfce4801 100644 (file)
--- a/include/asm-powerpc/types.h
+++ b/include/asm-powerpc/types.h
@@ -64,6 +64,8 @@ typedef struct {
 
 #ifndef __ASSEMBLY__
 
+#include <linux/config.h>
+
 typedef signed char s8;
 typedef unsigned char u8;
 
@@ -83,7 +85,11 @@ typedef unsigned long long u64;
 
 typedef __vector128 vector128;
 
+#ifdef __powerpc64__
+typedef u64 dma_addr_t;
+#else
 typedef u32 dma_addr_t;
+#endif
 typedef u64 dma64_addr_t;
 
 typedef struct {