[PATCH v2] SFI: fix compilation warnings

From: Andy Shevchenko
Date: Mon Dec 09 2013 - 04:10:02 EST


When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function âacpi_sfi_table_parseâ:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function âacpi_table_parseâ [-Werror=implicit-function-declaration]
if (!acpi_table_parse(signature, handler))
^
cc1: some warnings being treated as errors

The patch add linux/acpi.h to the top of file.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
Changes to v2:
- fix for build when ACPI=n, SFI=y
drivers/sfi/sfi_acpi.c | 2 +-
include/linux/sfi_acpi.h | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c
index 5e753d7..5589ec5 100644
--- a/drivers/sfi/sfi_acpi.c
+++ b/drivers/sfi/sfi_acpi.c
@@ -60,7 +60,7 @@
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

#include <linux/kernel.h>
-#include <acpi/acpi.h> /* FIXME: inclusion should be removed */
+#include <linux/acpi.h>

#include <linux/sfi.h>
#include "sfi_core.h"
diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
index 2cfcb79..ecc2344 100644
--- a/include/linux/sfi_acpi.h
+++ b/include/linux/sfi_acpi.h
@@ -60,7 +60,9 @@
#define _LINUX_SFI_ACPI_H

#ifdef CONFIG_SFI
-#include <acpi/acpi.h> /* FIXME: inclusion should be removed */
+
+#include <acpi/acpi.h>
+#include <linux/acpi.h>

extern int sfi_acpi_table_parse(char *signature, char *oem_id,
char *oem_table_id,
--
1.8.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/