diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-26 14:50:56 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-26 14:50:56 -0400 |
| commit | 1bd64d42abdd4f9d44f77011a31f0292112f4c3b (patch) | |
| tree | 6eae9454b9a30813b75cfa55680b7fc13a5e110c /include | |
| parent | 4895ae6f9f81011bf3a6fea70d46bab08d58fd8c (diff) | |
| parent | 4a3cba5e72a5232842ff7c1ca691ec3450af64b9 (diff) | |
Merge branch 'acpi-mmio' into release
Conflicts:
drivers/acpi/osl.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index c227757feb0..7774e6d8fdd 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -308,6 +308,9 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req); extern void acpi_early_init(void); +int acpi_os_map_generic_address(struct acpi_generic_address *addr); +void acpi_os_unmap_generic_address(struct acpi_generic_address *addr); + #else /* !CONFIG_ACPI */ #define acpi_disabled 1 |