diff options
author | Ray Lee <ray-lk@madrabbit.org> | 2007-04-25 14:12:00 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-04-25 14:12:00 -0400 |
commit | d8938801d10945ac2fbe0f41ded43f6276660a17 (patch) | |
tree | 095c605615d2a67c564c326f895bfcfc617f43a8 /drivers/acpi/processor_idle.c | |
parent | f989106cac719f8fe91da7734e73b3ca09146ecc (diff) |
ACPI: remove duplicate include
Thomas's patch for including <asm/apic.h> for x86 UP builds came into
Linus's tree from two different directions, both of which were merged.
This reverts the latter, yanking out the duplicate #include and comment.
Signed-off-by: Ray Lee <ray-lk@madrabbit.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
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, 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 @@ | |||
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 | |||
62 | #include <asm/io.h> | 54 | #include <asm/io.h> |
63 | #include <asm/uaccess.h> | 55 | #include <asm/uaccess.h> |
64 | 56 | ||