The patch titled
acpi/processor_idle.c: remove duplicate include
has been added to the -mm tree. Its filename is
acpi-processor_idlec-remove-duplicate-include.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: acpi/processor_idle.c: remove duplicate include
From: Ray Lee <ray-lk@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/processor_idle.c | 8 --------
1 files changed, 8 deletions(-)
diff -puN drivers/acpi/processor_idle.c~acpi-processor_idlec-remove-duplicate-include drivers/acpi/processor_idle.c
--- a/drivers/acpi/processor_idle.c~acpi-processor_idlec-remove-duplicate-include
+++ a/drivers/acpi/processor_idle.c
@@ -52,14 +52,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>
_
Patches currently in -mm which might be from ray-lk@xxxxxxxxxxxxx are
acpi-processor_idlec-remove-duplicate-include.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
