From dac7515f9f913d676b90ccba65e0774400c91ffc Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Thu, 7 Dec 2006 02:14:07 +0100
Subject: [PATCH] --- yaml --- r: 43068 b: refs/heads/master c:
 db91b882aabd0b3b55a87cbfb344f2798bb740b4 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/i386/kernel/cpuid.c | 1 -
 trunk/arch/i386/kernel/tsc.c   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index da4b84815193..4539660a61e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3529833f1ca8790df06ce218b5d9d438776696ed
+refs/heads/master: db91b882aabd0b3b55a87cbfb344f2798bb740b4
diff --git a/trunk/arch/i386/kernel/cpuid.c b/trunk/arch/i386/kernel/cpuid.c
index ab0c327e79dc..5c5d4507ee7d 100644
--- a/trunk/arch/i386/kernel/cpuid.c
+++ b/trunk/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 --git a/trunk/arch/i386/kernel/tsc.c b/trunk/arch/i386/kernel/tsc.c
index fbc95828cd74..7f22e03253e2 100644
--- a/trunk/arch/i386/kernel/tsc.c
+++ b/trunk/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"