Skip to content

Commit

Permalink
ACPI / SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - t…
Browse files Browse the repository at this point in the history
…able 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: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Lv Zheng authored and Rafael J. Wysocki committed Jul 22, 2014
1 parent 633adab commit f997ea5
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions include/linux/sfi_acpi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *));
Expand All @@ -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 *))
Expand Down

0 comments on commit f997ea5

Please sign in to comment.