ACPI: remove duplicate include
authorRay Lee <ray-lk@madrabbit.org>
Wed, 25 Apr 2007 18:12:00 +0000 (14:12 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 25 Apr 2007 18:12:00 +0000 (14:12 -0400)
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>
drivers/acpi/processor_idle.c

index cdf78943af4db915f1a54da4285cbca2cc1c42ac..ae0654cd11eaa58bcf3fff763e2cd3d341004a44 100644 (file)
 #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>