aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2009-02-09 02:00:04 -0500
committerJesse Barnes <jbarnes@hobbes.lan>2009-03-19 22:29:33 -0400
commit9f5404d8ea90bfa4d58a3936e5a3d0d28cecf60f (patch)
tree59327fd70858e5038b99cebd767d4bae6a7d4594 /drivers/acpi/pci_root.c
parent63f10f0f6df4e4e860b790d64bebfde85b540b0a (diff)
PCI/ACPI: rename pci_osc_control_set()
- Rename pci_osc_control_set() to acpi_pci_osc_control_set() according to the other API names in drivers/acpi/pci_root.c. - Move _OSC related definitions to include/linux/acpi.h because _OSC related API is implemented in drivers/acpi/pci_root.c now. Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Reviewed-by: Andrew Patterson <andrew.patterson@hp.com> Tested-by: Andrew Patterson <andrew.patterson@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r--drivers/acpi/pci_root.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 979eccc82c5..196f97d0095 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -306,13 +306,13 @@ static struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle)
306} 306}
307 307
308/** 308/**
309 * pci_osc_control_set - commit requested control to Firmware 309 * acpi_pci_osc_control_set - commit requested control to Firmware
310 * @handle: acpi_handle for the target ACPI object 310 * @handle: acpi_handle for the target ACPI object
311 * @flags: driver's requested control bits 311 * @flags: driver's requested control bits
312 * 312 *
313 * Attempt to take control from Firmware on requested control bits. 313 * Attempt to take control from Firmware on requested control bits.
314 **/ 314 **/
315acpi_status pci_osc_control_set(acpi_handle handle, u32 flags) 315acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags)
316{ 316{
317 acpi_status status; 317 acpi_status status;
318 u32 control_req, result, capbuf[3]; 318 u32 control_req, result, capbuf[3];
@@ -359,7 +359,7 @@ out:
359 mutex_unlock(&osc_lock); 359 mutex_unlock(&osc_lock);
360 return status; 360 return status;
361} 361}
362EXPORT_SYMBOL(pci_osc_control_set); 362EXPORT_SYMBOL(acpi_pci_osc_control_set);
363 363
364static int __devinit acpi_pci_root_add(struct acpi_device *device) 364static int __devinit acpi_pci_root_add(struct acpi_device *device)
365{ 365{