diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 08:32:18 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 08:33:14 +0100 |
| commit | f19693a17c6705e197eb24d4618060eaac1b535c (patch) | |
| tree | fc39dc23297c0e6be730cb0dfd74a34d9c0b8bfd /include/linux/acpi.h | |
| parent | 23b120cdfae4f5c29da69de750d545bad719ead4 (diff) | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
| download | kernel_samsung_smdk4412-f19693a17c6705e197eb24d4618060eaac1b535c.zip kernel_samsung_smdk4412-f19693a17c6705e197eb24d4618060eaac1b535c.tar.gz kernel_samsung_smdk4412-f19693a17c6705e197eb24d4618060eaac1b535c.tar.bz2 | |
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
Conflicts:
arch/arm/mach-mxs/clock-mx28.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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 eb176bb..a2e910e 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 |