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/acpi/bus.c | |
| parent | Merge branch 'acpi-config' (diff) | |
| parent | ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST (diff) | |
| download | linux-2eb060975df2aaca635801dcfb99eaa45ede98fe.tar.xz linux-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/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index afe6f9a919c1..e7e5844c87d0 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -311,9 +311,7 @@ static void acpi_bus_osc_support(void) capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT; #endif -#ifdef ACPI_HOTPLUG_OST capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT; -#endif if (!ghes_disable) capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_APEI_SUPPORT; @@ -410,7 +408,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) return; err: - acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL); + acpi_evaluate_ost(handle, type, ost_code, NULL); } /* -------------------------------------------------------------------------- |