Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-int…

…types * 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
git-mirror · May 5, 2008 · f74d505 · f74d505
2 parents 45ea210 + 2961b42
commit f74d505
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -19,8 +19,6 @@
 
 typedef unsigned short umode_t;
 
-#endif
-
 #endif /* __ASSEMBLY__ */
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,8 +19,6 @@ @@
     typedef unsigned short umode_t;
-    #endif
     #endif /* __ASSEMBLY__ */
     /*
@@ Expand Down @@