dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Linus Torvalds 2008-05-04 17:12:10 -07:00
parent 45ea2103d8 2961b42303
commit f74d505b58
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/asm-alpha/types.h
View File

@ -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 */

2
include/asm-mips/types.h
View File

@ -19,8 +19,6 @@
typedef unsigned short umode_t;
#endif
#endif /* __ASSEMBLY__ */
/*