X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-s390%2Ftypes.h;h=41c547656130e75bb206312f3175d23bd2e868a7;hb=df1efe6f871e2d3f83e6ad7b7a1d2b728b478fc2;hp=78dda038dd47c3b60e153e78dab2e67ac5f16dda;hpb=4880d10927c93d858d40e297361fff375ee98492;p=linux-2.6

diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
index 78dda038dd..41c5476561 100644
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
@@ -10,9 +10,9 @@
 #define _S390_TYPES_H
 
 #ifndef __s390x__
-# include <asm-generic/int-l64.h>
-#else
 # include <asm-generic/int-ll64.h>
+#else
+# include <asm-generic/int-l64.h>
 #endif
 
 #ifndef __ASSEMBLY__
@@ -40,7 +40,13 @@ typedef __signed__ long saddr_t;
 
 #ifndef __ASSEMBLY__
 
+typedef u64 dma64_addr_t;
+#ifdef __s390x__
+/* DMA addresses come in 32-bit and 64-bit flavours. */
+typedef u64 dma_addr_t;
+#else
 typedef u32 dma_addr_t;
+#endif
 
 #ifndef __s390x__
 typedef union {