diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:39:35 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:39:35 -0500 |
| commit | f4256e301d9800b1e0276404cb01b3ac85b51067 (patch) | |
| tree | 975f56627b78f757608b31684311a24ca1478481 /drivers/pci/pci-acpi.c | |
| parent | fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 (diff) | |
| parent | cd52d1ee9a92587b242d946a2300a3245d3b885a (diff) | |
| download | kernel_samsung_tuna-f4256e301d9800b1e0276404cb01b3ac85b51067.zip kernel_samsung_tuna-f4256e301d9800b1e0276404cb01b3ac85b51067.tar.gz kernel_samsung_tuna-f4256e301d9800b1e0276404cb01b3ac85b51067.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'drivers/pci/pci-acpi.c')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index e9e37ab..a9b00cc 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -91,9 +91,7 @@ acpi_query_osc ( static acpi_status acpi_run_osc ( acpi_handle handle, - u32 level, - void *context, - void **retval ) + void *context) { acpi_status status; struct acpi_object_list input; @@ -184,7 +182,7 @@ EXPORT_SYMBOL(pci_osc_support_set); * * Attempt to take control from Firmware on requested control bits. **/ -acpi_status pci_osc_control_set(u32 flags) +acpi_status pci_osc_control_set(acpi_handle handle, u32 flags) { acpi_status status; u32 ctrlset; @@ -198,10 +196,7 @@ acpi_status pci_osc_control_set(u32 flags) return AE_SUPPORT; } ctrlset_buf[OSC_CONTROL_TYPE] |= ctrlset; - status = acpi_get_devices ( PCI_ROOT_HID_STRING, - acpi_run_osc, - ctrlset_buf, - NULL ); + status = acpi_run_osc(handle, ctrlset_buf); if (ACPI_FAILURE (status)) { ctrlset_buf[OSC_CONTROL_TYPE] &= ~ctrlset; } |