aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-04 17:12:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-04 17:12:10 -0700
commitf74d505b58d36ceeef10e459094f0eb760681165 (patch)
tree94f5cd7bfda9b1e0c4dd4b15d0f902f20b97a717
parent45ea2103d8856454503b30464cc1dba378748d00 (diff)
parent2961b423037da60a8cb230963ee0d8c04473d73b (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes: fix asm-mips/types.h syntax error fix asm-alpha/types.h breakage
-rw-r--r--include/asm-alpha/types.h6
-rw-r--r--include/asm-mips/types.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-alpha/types.h b/include/asm-alpha/types.h
index a9e34ca4d46..c1541353cce 100644
--- a/include/asm-alpha/types.h
+++ b/include/asm-alpha/types.h
@@ -23,5 +23,11 @@ typedef unsigned int umode_t;
#define BITS_PER_LONG 64
+#ifndef __ASSEMBLY__
+
+typedef u64 dma_addr_t;
+typedef u64 dma64_addr_t;
+
+#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ALPHA_TYPES_H */
diff --git a/include/asm-mips/types.h b/include/asm-mips/types.h
index 7a2ee4f4013..bcbb8d675af 100644
--- a/include/asm-mips/types.h
+++ b/include/asm-mips/types.h
@@ -19,8 +19,6 @@
typedef unsigned short umode_t;
-#endif
-
#endif /* __ASSEMBLY__ */
/*