diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 19:29:43 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 19:29:43 +0900 |
| commit | f94f3cb37a1c4d44dd2070cc4a6165689bda9c92 (patch) | |
| tree | 21bbdeacbc1b9895cf917231d1675eaaa63b9229 /include/linux/acpi.h | |
| parent | e27808df97ff7b43b4927aadf410705f33313523 (diff) | |
| parent | 1b4610ebf37a05a65e9f29cdf4d87c207573104d (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index eb176bb1b15..a2e910e0129 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -306,9 +306,6 @@ 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 |