The patch titled
arch/i386: double inclusions
has been added to the -mm tree. Its filename is
arch-i386-double-inclusions.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: arch/i386: double inclusions
From: Nicolas Kaiser <nikai@xxxxxxxxx>
double inclusions in arch/i386
Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/cpuid.c | 1 -
arch/i386/kernel/tsc.c | 1 -
2 files changed, 2 deletions(-)
diff -puN arch/i386/kernel/cpuid.c~arch-i386-double-inclusions arch/i386/kernel/cpuid.c
--- a/arch/i386/kernel/cpuid.c~arch-i386-double-inclusions
+++ a/arch/i386/kernel/cpuid.c
@@ -34,7 +34,6 @@
#include <linux/major.h>
#include <linux/fs.h>
#include <linux/smp_lock.h>
-#include <linux/fs.h>
#include <linux/device.h>
#include <linux/cpu.h>
#include <linux/notifier.h>
diff -puN arch/i386/kernel/tsc.c~arch-i386-double-inclusions arch/i386/kernel/tsc.c
--- a/arch/i386/kernel/tsc.c~arch-i386-double-inclusions
+++ a/arch/i386/kernel/tsc.c
@@ -13,7 +13,6 @@
#include <asm/delay.h>
#include <asm/tsc.h>
-#include <asm/delay.h>
#include <asm/io.h>
#include "mach_timer.h"
_
Patches currently in -mm which might be from nikai@xxxxxxxxx are
arch-i386-double-inclusions.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
