summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/internal.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-04-06 02:07:33 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-04-06 02:07:33 -0400
commit054838bc019c90511d034fb796dc8c7715460fc2 (patch)
treea04b9fa86e3cfb8adb285fcd33bd47983f75d8fb /drivers/acpi/internal.h
parentd597580d373774b1bdab84b3d26ff0b55162b916 (diff)
parentfc69910f329d61821897871e0e957eda39beb3d8 (diff)
downloadlinux-054838bc019c90511d034fb796dc8c7715460fc2.tar.bz2
Merge commit 'fc69910f329d' into uaccess.mips
backmerge of a build fix from mainline
Diffstat (limited to 'drivers/acpi/internal.h')
-rw-r--r--drivers/acpi/internal.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 219b90bc0922..f15900132912 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -41,8 +41,10 @@ void acpi_gpe_apply_masked_gpes(void);
void acpi_container_init(void);
void acpi_memory_hotplug_init(void);
#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
+void pci_ioapic_remove(struct acpi_pci_root *root);
int acpi_ioapic_remove(struct acpi_pci_root *root);
#else
+static inline void pci_ioapic_remove(struct acpi_pci_root *root) { return; }
static inline int acpi_ioapic_remove(struct acpi_pci_root *root) { return 0; }
#endif
#ifdef CONFIG_ACPI_DOCK