diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 18:52:41 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 18:52:41 -0500 |
| commit | 81450b73dde07f473a4a7208b209b4c8b7251d90 (patch) | |
| tree | 94e676c74c32f2a74dc306cf863d7e190777f2ab /drivers/acpi/processor_idle.c | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
| parent | 0539771d7236b425f285652f6f297cc7939c8f9a (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.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 8206fc1ecc58..835595ae06b3 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -51,6 +51,14 @@ | |||
| 51 | #include <asm/apic.h> | 51 | #include <asm/apic.h> |
| 52 | #endif | 52 | #endif |
| 53 | 53 | ||
| 54 | /* | ||
| 55 | * Include the apic definitions for x86 to have the APIC timer related defines | ||
| 56 | * available also for UP (on SMP it gets magically included via linux/smp.h). | ||
| 57 | */ | ||
| 58 | #ifdef CONFIG_X86 | ||
| 59 | #include <asm/apic.h> | ||
| 60 | #endif | ||
| 61 | |||
| 54 | #include <asm/io.h> | 62 | #include <asm/io.h> |
| 55 | #include <asm/uaccess.h> | 63 | #include <asm/uaccess.h> |
| 56 | 64 | ||