提交 f997ea54 编写于 作者: L Lv Zheng 提交者: Rafael J. Wysocki

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: NLv Zheng <lv.zheng@intel.com>
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
上级 633adaba
...@@ -63,8 +63,6 @@ ...@@ -63,8 +63,6 @@
#include <linux/sfi.h> #include <linux/sfi.h>
#ifdef CONFIG_SFI #ifdef CONFIG_SFI
#include <acpi/acpi.h> /* FIXME: inclusion should be removed */
extern int sfi_acpi_table_parse(char *signature, char *oem_id, extern int sfi_acpi_table_parse(char *signature, char *oem_id,
char *oem_table_id, char *oem_table_id,
int (*handler)(struct acpi_table_header *)); int (*handler)(struct acpi_table_header *));
...@@ -78,7 +76,6 @@ static inline int __init acpi_sfi_table_parse(char *signature, ...@@ -78,7 +76,6 @@ static inline int __init acpi_sfi_table_parse(char *signature,
return sfi_acpi_table_parse(signature, NULL, NULL, handler); return sfi_acpi_table_parse(signature, NULL, NULL, handler);
} }
#else /* !CONFIG_SFI */ #else /* !CONFIG_SFI */
static inline int sfi_acpi_table_parse(char *signature, char *oem_id, static inline int sfi_acpi_table_parse(char *signature, char *oem_id,
char *oem_table_id, char *oem_table_id,
int (*handler)(struct acpi_table_header *)) int (*handler)(struct acpi_table_header *))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册