diff options
author | Dave Airlie <airlied@redhat.com> | 2010-09-24 15:37:33 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-09-24 15:37:33 +1000 |
commit | 4a445f291ac3faa08f56eaeb6e44856b6b72b74c (patch) | |
tree | b66cc93311dc4c623113a87aa9b40730a21ac18e /include/linux/acpi.h | |
parent | cbc60ca04b342a4e1f2a1086a7277c077f07dbed (diff) | |
parent | a850ea30374ebed32a0724742601861853fde869 (diff) | |
download | kernel_samsung_smdk4412-4a445f291ac3faa08f56eaeb6e44856b6b72b74c.zip kernel_samsung_smdk4412-4a445f291ac3faa08f56eaeb6e44856b6b72b74c.tar.gz kernel_samsung_smdk4412-4a445f291ac3faa08f56eaeb6e44856b6b72b74c.tar.bz2 |
Merge remote branch 'origin/master' of /home/airlied/kernel//linux-2.6 into drm-core-next
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index ccf94dc..c227757 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -304,8 +304,8 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); OSC_PCI_EXPRESS_PME_CONTROL | \ OSC_PCI_EXPRESS_AER_CONTROL | \ OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL) - -extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags); +extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, + u32 *mask, u32 req); extern void acpi_early_init(void); #else /* !CONFIG_ACPI */ |