diff options
| author | Len Brown <len.brown@intel.com> | 2007-04-28 23:12:03 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-04-28 23:12:03 -0400 |
| commit | fb16596997ded3e70d308bec58e32c1e2c5cf9b0 (patch) | |
| tree | 28939b49c26e51d2c22047ef2e07f4b1d6352bbb /drivers/acpi/processor_idle.c | |
| parent | f188291aec9b17ef7cec01db66b9cdb6fae26372 (diff) | |
| parent | afd3810d9b6b0d446a34e1d4e94f0cc020b00a14 (diff) | |
Pull misc-for-upstream into release branch
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index cdf78943af4d..ae0654cd11ea 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -51,14 +51,6 @@ #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> |