From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pa0-x229.google.com ([2607:f8b0:400e:c03::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VxYF0-0002M3-52 for barebox@lists.infradead.org; Mon, 30 Dec 2013 08:30:26 +0000 Received: by mail-pa0-f41.google.com with SMTP id lf10so11426957pab.14 for ; Mon, 30 Dec 2013 00:30:04 -0800 (PST) From: u74147@gmail.com Date: Mon, 30 Dec 2013 16:29:53 +0800 Message-Id: <1388392193-5411-1-git-send-email-u74147@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH] mips asm/types.h: add #ifndef to fix compile error To: barebox@lists.infradead.org From: Du Huanpeng without "#ifndef __ASSEMBLY__ #endif", an assembly file including this file will break compilation. Signed-off-by: Du Huanpeng --- arch/mips/include/asm/types.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h index f5373cc..0341e8b 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 + /* * We don't use int-l64.h for the kernel anymore but still use it for * userspace to avoid code changes. -- 1.7.9.5 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox