Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f997ea54 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPI / SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - table definitions. 



This patch removes <acpi/acpi.h> inclusions from <linux/sfi_acpi.h> as
<linux/acpi.h> has already included it for CONFIG_ACPI=n builds.

Cc: Len Brown <lenb@kernel.org>
Cc: sfi-devel@simplefirmware.org
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 633adaba

include/linux/sfi_acpi.h

+0 −3
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ 
#include <linux/sfi.h>



#ifdef CONFIG_SFI

#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */



extern int sfi_acpi_table_parse(char *signature, char *oem_id,

				char *oem_table_id,

				int (*handler)(struct acpi_table_header *));
@@ -78,7 +76,6 @@ static inline int __init acpi_sfi_table_parse(char *signature, 
	return sfi_acpi_table_parse(signature, NULL, NULL, handler);

}

#else /* !CONFIG_SFI */



static inline int sfi_acpi_table_parse(char *signature, char *oem_id,

				char *oem_table_id,

				int (*handler)(struct acpi_table_header *))