Merge branch 'linus' into release

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / acpi.c

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 0553648b7595742f5e19bc99ff6e6eca0c7b0284..d541671caf4a8d7e655ce5b9e811b25c8dd4777b 100644 (file)
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -65,6 +65,7 @@ EXPORT_SYMBOL(pm_idle);
 void (*pm_power_off) (void);
 EXPORT_SYMBOL(pm_power_off);
 
+u32 acpi_rsdt_forced;
 unsigned int acpi_cpei_override;
 unsigned int acpi_cpei_phys_cpuid;