mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
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:
commit
f74d505b58
2 changed files with 6 additions and 2 deletions
|
@ -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 */
|
||||
|
|
|
@ -19,8 +19,6 @@
|
|||
|
||||
typedef unsigned short umode_t;
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue