aboutsummaryrefslogtreecommitdiff
path: root/include/acpi/acpi_bus.h
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-29 18:40:30 +0100
committerMark Brown <broonie@linaro.org>2013-08-29 18:40:30 +0100
commit72bce45fdecab65936f1e466c5c5107e48f8251e (patch)
treee5009748ab6136465c812860b7913d06098ed520 /include/acpi/acpi_bus.h
parent0d0c6fddf052ca1e5324297420ed587a95b7be82 (diff)
parent965abff8d8accdffc4af1b11fcf580e83031330a (diff)
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-13.08
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r--include/acpi/acpi_bus.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index c13c919ab99..f45b2a7800c 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -455,7 +455,11 @@ struct acpi_pci_root {
};
/* helper */
-acpi_handle acpi_get_child(acpi_handle, u64);
+acpi_handle acpi_find_child(acpi_handle, u64, bool);
+static inline acpi_handle acpi_get_child(acpi_handle handle, u64 addr)
+{
+ return acpi_find_child(handle, addr, false);
+}
int acpi_is_root_bridge(acpi_handle);
struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle);
#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)ACPI_HANDLE(dev))