diff options
| author | Du Huanpeng <u74147@gmail.com> | 2014-01-01 14:00:40 +0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-06 09:22:31 +0100 |
| commit | 3173c27e4a4babc7b9638214cbd3c4c348cff807 (patch) | |
| tree | d3a4ec605db5cfe925855e945431b2297fb9175b /arch/mips/include | |
| parent | 26f2c815d1768e16bd4b953ee24e2dcf41700258 (diff) | |
| download | barebox-3173c27e4a4babc7b9638214cbd3c4c348cff807.tar.gz barebox-3173c27e4a4babc7b9638214cbd3c4c348cff807.tar.xz | |
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 <u74147@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/mips/include')
| -rw-r--r-- | arch/mips/include/asm/types.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 <asm-generic/int-ll64.h> +#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. |