Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761668AbbBJC1f (ORCPT ); Mon, 9 Feb 2015 21:27:35 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:44512 "EHLO e9.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761613AbbBJC12 (ORCPT ); Mon, 9 Feb 2015 21:27:28 -0500 From: Stewart Smith To: mpe@ellerman.id.au, benh@kernel.crashing.org Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Stewart Smith 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> X-Mailer: git-send-email 1.7.10.4 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> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15021002-0033-0000-0000-000001CD8463 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1023 Lines: 39 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/