Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[oweals/u-boot.git] / include / asm-m68k / types.h

diff --git a/include/asm-m68k/types.h b/include/asm-m68k/types.h
index e944d3fd19239ab022cd4a385b3239d1e2cda35d..3ffcab20df95ec01db49c81eda331ecc9bd5f0c0 100644 (file)
--- a/include/asm-m68k/types.h
+++ b/include/asm-m68k/types.h
@@ -21,7 +21,7 @@ __extension__ typedef unsigned long long __u64;
 
 typedef struct {
        __u32 u[4];
-} __attribute((aligned(16))) vector128;
+} __attribute__((aligned(16))) vector128;
 
 #ifdef __KERNEL__
 /*
@@ -44,6 +44,9 @@ typedef unsigned long long u64;
 /* DMA addresses are 32-bits wide */
 typedef u32 dma_addr_t;
 
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
+
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */