summaryrefslogtreecommitdiff
path: root/include/linux/iscsi_ibft.h
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2013-12-06 12:52:19 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 04:24:33 +0400
commit9d24622ced329e35e2349ef419355a87d94be61f (patch)
tree72defecca1a4c23923651a7c4c7399828b1877a8 /include/linux/iscsi_ibft.h
parent27d50c82714f6477ac690034b37d202f76eb4f70 (diff)
downloadlinux-9d24622ced329e35e2349ef419355a87d94be61f.tar.xz
ACPI / IBFT: Fix incorrect <acpi/acpi.h> inclusion in iSCSI boot firmware module
To avoid build problems and breaking dependencies between ACPI header files, <acpi/acpi.h> should not be included directly by code outside of the ACPI core subsystem, but this is done by the ACPI iSCSI Boot Firmware code. The iBFT specification doesn't mention whether or not it can appear on a non-ACPI platform, but is says that ACPI 3.0b defines the mechanism. The current CONFIG_ISCSI_IBFT_FIND code doesn't use the ACPI tables API to locate the table, so it doesn't rely on CONFIG_ACPI directly. However, since iBFT is is an ACPI-based mechanism (please refer to the documentation link below for more information), it should be correct to make CONFIG_ISCSI_IBFT_FIND depend on CONFIG_ACPI (even though the table location can be implemented without using ACPI tables API). After that change, include/linux/iscsi_ibft.h can be modified to include <linux/acpi.h> instead of <acpi/acpi.h> as appropriate. References: http://www.microsoft.com/whdc/system/platform/firmware/ibft.mspx Cc: Konrad Rzeszutek Wilk <konrad@kernel.org> Cc: Peter Jones <pjones@redhat.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> [rjw: Subject and changelog] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/iscsi_ibft.h')
-rw-r--r--include/linux/iscsi_ibft.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iscsi_ibft.h b/include/linux/iscsi_ibft.h
index 82f9673c2527..605cc5c333d9 100644
--- a/include/linux/iscsi_ibft.h
+++ b/include/linux/iscsi_ibft.h
@@ -21,7 +21,7 @@
#ifndef ISCSI_IBFT_H
#define ISCSI_IBFT_H
-#include <acpi/acpi.h> /* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
/*
* Logical location of iSCSI Boot Format Table.