From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757122AbcAJPfi (ORCPT ); Sun, 10 Jan 2016 10:35:38 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:45040 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755212AbcAJPfg (ORCPT ); Sun, 10 Jan 2016 10:35:36 -0500 From: Guenter Roeck To: Matt Fleming Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck , Ard Biesheuvel , Will Deacon Subject: [PATCH -next] efi: Do not include asm/efi.h if not needed Date: Sun, 10 Jan 2016 07:35:28 -0800 Message-Id: <1452440128-15134-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.4 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit f7d924894265 ("arm64/efi: refactor EFI init and runtime code for reuse by 32-bit ARM") adds an include of asm/efi.h to efi.c. This causes a build failure for ia64, where asm/efi.h does not exist. drivers/firmware/efi/efi.c:28:21: fatal error: asm/efi.h: No such file or directory asm/efi.h does not define or declare anything used by efi.c, thus including it should not be needed. Fixes: f7d924894265 ("arm64/efi: refactor EFI init and runtime code for reuse by 32-bit ARM") Cc: Ard Biesheuvel Cc: Will Deacon Signed-off-by: Guenter Roeck --- drivers/firmware/efi/efi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index cffa89b3317b..027ca212179f 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -25,8 +25,6 @@ #include #include -#include - struct efi __read_mostly efi = { .mps = EFI_INVALID_TABLE_ADDR, .acpi = EFI_INVALID_TABLE_ADDR, -- 2.1.4