aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/firmware/Kconfig2
-rw-r--r--include/linux/iscsi_ibft.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 074787281c94..a6ef6acaa1c8 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -110,7 +110,7 @@ config DMI_SYSFS
config ISCSI_IBFT_FIND
bool "iSCSI Boot Firmware Table Attributes"
- depends on X86
+ depends on X86 && ACPI
default n
help
This option enables the kernel to find the region of memory
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.