summaryrefslogtreecommitdiff
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-02 02:38:44 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-02 02:38:44 +0300
commit4ec9e2890a7a70dedbf0da28577fefe84d8f14e4 (patch)
treef1dd5d479a6f8748d347998051b6e9e637693311 /include/linux/acpi.h
parent84a78c724b1d7eae1c163e7a225a3ce9e0c61b6d (diff)
parent1ef356681ef412abfd93d1c36f15917a126833f5 (diff)
downloadlinux-4ec9e2890a7a70dedbf0da28577fefe84d8f14e4.tar.xz
Merge branch 'acpi-bus'
* acpi-bus: ACPI / bus: Adjust ACPI subsystem initialization for new table loading mode ACPI / bus: Make acpi_get_first_physical_node() public
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index c5eaf2f80a4c..e7465528b8dc 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -85,6 +85,8 @@ static inline const char *acpi_dev_name(struct acpi_device *adev)
return dev_name(&adev->dev);
}
+struct device *acpi_get_first_physical_node(struct acpi_device *adev);
+
enum acpi_irq_model_id {
ACPI_IRQ_MODEL_PIC = 0,
ACPI_IRQ_MODEL_IOAPIC,
@@ -634,6 +636,11 @@ static inline const char *acpi_dev_name(struct acpi_device *adev)
return NULL;
}
+static inline struct device *acpi_get_first_physical_node(struct acpi_device *adev)
+{
+ return NULL;
+}
+
static inline void acpi_early_init(void) { }
static inline void acpi_subsystem_init(void) { }