Messages in this thread Patch in this message | | | Date | Sun, 4 May 2008 15:38:40 -0700 | From | "H. Peter Anvin" <> | Subject | [GIT PULL] types.h fixes |
| |
Hi Linus, please pull:
git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes.git
Adrian Bunk (2): fix asm-alpha/types.h breakage fix asm-mips/types.h syntax error
diff --git a/include/asm-alpha/types.h b/include/asm-alpha/types.h index a9e34ca..c154135 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 7a2ee4f..bcbb8d6 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__ */ /*
| |