From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e8.ny.us.ibm.com (e8.ny.us.ibm.com [32.97.182.138]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 0500B1A0316 for ; Tue, 10 Feb 2015 13:27:30 +1100 (AEDT) Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 9 Feb 2015 21:27:28 -0500 Received: from b01cxnp22036.gho.pok.ibm.com (b01cxnp22036.gho.pok.ibm.com [9.57.198.26]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 66A3CC90042 for ; Mon, 9 Feb 2015 21:18:36 -0500 (EST) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1A2ROOq27983964 for ; Tue, 10 Feb 2015 02:27:25 GMT Received: from d01av02.pok.ibm.com (localhost [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t1A2RNxL015883 for ; Mon, 9 Feb 2015 21:27:23 -0500 From: Stewart Smith To: mpe@ellerman.id.au, benh@kernel.crashing.org Subject: [PATCH 15/18] powerpc/powernv: sync #includes in opal.h with firmware Date: Tue, 10 Feb 2015 13:26:57 +1100 Message-Id: <1423535220-6322-16-git-send-email-stewart@linux.vnet.ibm.com> In-Reply-To: <1423535220-6322-1-git-send-email-stewart@linux.vnet.ibm.com> References: <1423535220-6322-1-git-send-email-stewart@linux.vnet.ibm.com> Cc: Stewart Smith , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Signed-off-by: Stewart Smith --- arch/powerpc/include/asm/opal.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h index 2aaa861..b60a25a 100644 --- a/arch/powerpc/include/asm/opal.h +++ b/arch/powerpc/include/asm/opal.h @@ -12,6 +12,12 @@ #ifndef __OPAL_H #define __OPAL_H +#ifdef __SKIBOOT__ +#ifndef __ASSEMBLY__ +#include +#endif /* __ASSEMBLY__ */ +#endif /* __SKIBOOT__ */ + /****** OPAL APIs ******/ /* Return codes */ @@ -164,8 +170,6 @@ #ifndef __ASSEMBLY__ -#include - /* Other enums */ enum OpalVendorApiTokens { OPAL_START_VENDOR_API_RANGE = 1000, OPAL_END_VENDOR_API_RANGE = 1999 -- 1.7.10.4