aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/processor_idle.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 18:52:41 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 18:52:41 -0500
commit81450b73dde07f473a4a7208b209b4c8b7251d90 (patch)
tree94e676c74c32f2a74dc306cf863d7e190777f2ab /drivers/acpi/processor_idle.c
parent8a03d9a498eaf02c8a118752050a5154852c13bf (diff)
parent0539771d7236b425f285652f6f297cc7939c8f9a (diff)
Pull misc-for-upstream into release branch
Conflicts: drivers/usb/misc/appledisplay.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/processor_idle.c')
-rw-r--r--drivers/acpi/processor_idle.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 8206fc1ecc5..835595ae06b 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -51,6 +51,14 @@
#include <asm/apic.h>
#endif
+/*
+ * Include the apic definitions for x86 to have the APIC timer related defines
+ * available also for UP (on SMP it gets magically included via linux/smp.h).
+ */
+#ifdef CONFIG_X86
+#include <asm/apic.h>
+#endif
+
#include <asm/io.h>
#include <asm/uaccess.h>