diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 21:31:17 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 21:31:17 -0400 |
| commit | bf891bd65de65284f3964216fcde493dba5149db (patch) | |
| tree | 082056dd77fa9599034424c46ef8a67f93565e89 /arch | |
| parent | de59e3aa6eda7fc7cd6c717f084930f6a841b602 (diff) | |
| parent | 9c576ff1bc9ab42d06457e68e39c121481138562 (diff) | |
| download | op-kernel-dev-bf891bd65de65284f3964216fcde493dba5149db.zip op-kernel-dev-bf891bd65de65284f3964216fcde493dba5149db.tar.gz | |
Pull trivial2 into release branch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 4 | ||||
| -rw-r--r-- | arch/ia64/mm/init.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 58c93a3..f97cc6c 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -68,8 +68,6 @@ EXPORT_SYMBOL(pm_power_off); unsigned char acpi_kbd_controller_present = 1; unsigned char acpi_legacy_devices; -static unsigned int __initdata acpi_madt_rev; - unsigned int acpi_cpei_override; unsigned int acpi_cpei_phys_cpuid; @@ -243,6 +241,8 @@ acpi_parse_iosapic(acpi_table_entry_header * header, const unsigned long end) return iosapic_init(iosapic->address, iosapic->global_irq_base); } +static unsigned int __initdata acpi_madt_rev; + static int __init acpi_parse_plat_int_src(acpi_table_entry_header * header, const unsigned long end) diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index cafa877..11f0800 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -671,9 +671,11 @@ int add_memory(u64 start, u64 size) return ret; } +EXPORT_SYMBOL_GPL(add_memory); int remove_memory(u64 start, u64 size) { return -EINVAL; } +EXPORT_SYMBOL_GPL(remove_memory); #endif |
