Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[mv-sheeva.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index eb176bb1b15b722f8c1f78b1650f38302e85a60f..a2e910e01293a01fd229cd59dfb1c1bb69f7be1a 100644 (file)
--- 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