diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 13:48:18 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 13:48:18 +0100 |
| commit | 2eb060975df2aaca635801dcfb99eaa45ede98fe (patch) | |
| tree | 0e8c5a409227b6d56665d1a149ea90985ab54ea2 /drivers/xen/xen-acpi-memhotplug.c | |
| parent | 75c44eddcb4989b85826143bc09fd3ad120abd4e (diff) | |
| parent | 700b8422fb9e6041907bda45a15f4e2ab0438a04 (diff) | |
| download | lwn-2eb060975df2aaca635801dcfb99eaa45ede98fe.tar.gz lwn-2eb060975df2aaca635801dcfb99eaa45ede98fe.zip | |
Merge branch 'acpi-ost'
* acpi-ost:
ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST
ACPI: use device name LNXSYBUS.xx for ACPI \_SB and \_TZ objects
ACPI / processor: use acpi_evaluate_ost() to replace open-coded version
ACPI / PAD / xen: use acpi_evaluate_ost() to replace open-coded version
ACPI / PAD: use acpi_evaluate_ost() to replace open-coded version
ACPI: rename acpi_evaluate_hotplug_ost() to acpi_evaluate_ost()
Diffstat (limited to 'drivers/xen/xen-acpi-memhotplug.c')
| -rw-r--r-- | drivers/xen/xen-acpi-memhotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/xen-acpi-memhotplug.c b/drivers/xen/xen-acpi-memhotplug.c index f8d18626969a..34e40b733f9a 100644 --- a/drivers/xen/xen-acpi-memhotplug.c +++ b/drivers/xen/xen-acpi-memhotplug.c @@ -285,7 +285,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data) return; } - (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL); + (void) acpi_evaluate_ost(handle, event, ost_code, NULL); return; } |