Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751638AbWKGK2y (ORCPT ); Tue, 7 Nov 2006 05:28:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751859AbWKGK2y (ORCPT ); Tue, 7 Nov 2006 05:28:54 -0500 Received: from ensim03.ffm.m2soft.com ([195.38.20.12]:6047 "EHLO ensim03.ffm.m2soft.com") by vger.kernel.org with ESMTP id S1751638AbWKGK2x (ORCPT ); Tue, 7 Nov 2006 05:28:53 -0500 X-ClientAddr: 85.126.108.208 Date: Tue, 7 Nov 2006 11:06:06 +0100 From: Nicolas Kaiser To: trivial@kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH][TRIVIAL] arch/i386: double inclusions Message-ID: <20061107110606.1505e19a@lucky.kitzblitz> Organization: - X-Face: "fF&[w2"Nws:JNH4'g|:gVhgGKLhj|X}}&w&V?]0=,7n`jy8D6e[Jh=7+ca|4~t5e[ItpL5 N'y~Mvi-vJm`"1T5fi1^b!&EG]6nW~C!FN},=$G?^U2t~n[3;u\"5-|~H{-5]IQ2 X-Mailer: Sylpheed-claws (Linux) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-M2Soft-MailScanner-Information: Please contact the ISP for more information X-M2Soft-MailScanner: Not scanned: please contact your Internet E-Mail Service Provider for details X-MailScanner-From: nikai@nikai.net Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1161 Lines: 37 double inclusions in arch/i386 Signed-off-by: Nicolas Kaiser --- arch/i386/kernel/cpuid.c | 1 - arch/i386/kernel/tsc.c | 1 - 2 files changed, 2 deletions(-) diff -uprN a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c --- a/arch/i386/kernel/cpuid.c 2006-09-20 05:42:06.000000000 +0200 +++ b/arch/i386/kernel/cpuid.c 2006-11-07 10:05:17.000000000 +0100 @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff -uprN a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c --- a/arch/i386/kernel/tsc.c 2006-09-20 05:42:06.000000000 +0200 +++ b/arch/i386/kernel/tsc.c 2006-11-07 10:05:42.000000000 +0100 @@ -13,7 +13,6 @@ #include #include -#include #include #include "mach_timer.h" - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/