Merge branch 'acpi-hotplug'

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 115c610..3e3247d 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -42,6 +42,7 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_numa.h>
+#include <acpi/acpi_io.h>
 #include <asm/acpi.h>
 
 static inline acpi_handle acpi_device_handle(struct acpi_device *adev)
@@ -466,7 +467,7 @@ struct acpi_table_header;
 static inline int acpi_table_parse(char *id,
                                int (*handler)(struct acpi_table_header *))
 {
-       return -1;
+       return -ENODEV;
 }
 
 static inline int acpi_nvs_register(__u64 start, __u64 size)