From 3173c27e4a4babc7b9638214cbd3c4c348cff807 Mon Sep 17 00:00:00 2001 From: Du Huanpeng Date: Wed, 1 Jan 2014 14:00:40 +0800 Subject: mips asm/types.h: add #ifndef to fix compile error without "#ifndef __ASSEMBLY__ #endif", an assembly file including this file will break compilation. Signed-off-by: Du Huanpeng Signed-off-by: Sascha Hauer --- arch/mips/include/asm/types.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/mips/include') diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h index f5373cc339..b63687d37b 100644 --- a/arch/mips/include/asm/types.h +++ b/arch/mips/include/asm/types.h @@ -13,6 +13,8 @@ #include +#ifndef __ASSEMBLY__ + #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \ || defined(CONFIG_64BIT) typedef u64 dma_addr_t; @@ -21,6 +23,8 @@ typedef u32 dma_addr_t; #endif typedef u64 dma64_addr_t; +#endif /* __ASSEMBLY__ */ + /* * We don't use int-l64.h for the kernel anymore but still use it for * userspace to avoid code changes. -- cgit v1.2.3