From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751001AbWDRKTd (ORCPT ); Tue, 18 Apr 2006 06:19:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751005AbWDRKTc (ORCPT ); Tue, 18 Apr 2006 06:19:32 -0400 Received: from mx2.suse.de ([195.135.220.15]:7331 "EHLO mx2.suse.de") by vger.kernel.org with ESMTP id S1750987AbWDRKTc (ORCPT ); Tue, 18 Apr 2006 06:19:32 -0400 Date: Tue, 18 Apr 2006 12:19:22 +0200 Message-ID: From: Takashi Iwai To: Adrian Bunk Cc: perex@suse.cz, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [Alsa-devel] [2.6 patch] sound/pci/: remove duplicate #include's In-Reply-To: <20060417010341.GA7429@stusta.de> References: <20060417010341.GA7429@stusta.de> User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta25) (eggplant) (+CVS-20060326) (i386-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org At Mon, 17 Apr 2006 03:03:41 +0200, Adrian Bunk wrote: > > There's no reason for #include'ing linux/dma-mapping.h more than once. Looks like a side-effect of a weird merge at some stage. I'll apply it to ALSA tree. Thanks, Takashi > > Signed-off-by: Adrian Bunk > > --- > > sound/pci/ad1889.c | 1 - > sound/pci/emu10k1/emu10k1x.c | 1 - > sound/pci/es1968.c | 1 - > sound/pci/ice1712/ice1712.c | 1 - > sound/pci/maestro3.c | 1 - > sound/pci/mixart/mixart.c | 1 - > sound/pci/pcxhr/pcxhr.c | 1 - > 7 files changed, 7 deletions(-) > > --- linux-2.6.17-rc1-mm2-full/sound/pci/ad1889.c.old 2006-04-17 02:51:46.000000000 +0200 > +++ linux-2.6.17-rc1-mm2-full/sound/pci/ad1889.c 2006-04-17 02:51:55.000000000 +0200 > @@ -37,11 +37,10 @@ > #include > #include > #include > #include > #include > -#include > > #include > #include > #include > #include > --- linux-2.6.17-rc1-mm2-full/sound/pci/emu10k1/emu10k1x.c.old 2006-04-17 02:52:04.000000000 +0200 > +++ linux-2.6.17-rc1-mm2-full/sound/pci/emu10k1/emu10k1x.c 2006-04-17 02:52:07.000000000 +0200 > @@ -34,11 +34,10 @@ > #include > #include > #include > #include > #include > -#include > #include > #include > #include > #include > #include > --- linux-2.6.17-rc1-mm2-full/sound/pci/es1968.c.old 2006-04-17 02:52:16.000000000 +0200 > +++ linux-2.6.17-rc1-mm2-full/sound/pci/es1968.c 2006-04-17 02:52:27.000000000 +0200 > @@ -102,11 +102,10 @@ > #include > #include > #include > #include > #include > -#include > #include > > #include > #include > #include > --- linux-2.6.17-rc1-mm2-full/sound/pci/ice1712/ice1712.c.old 2006-04-17 02:52:31.000000000 +0200 > +++ linux-2.6.17-rc1-mm2-full/sound/pci/ice1712/ice1712.c 2006-04-17 02:52:34.000000000 +0200 > @@ -54,11 +54,10 @@ > #include > #include > #include > #include > #include > -#include > #include > > #include > #include > #include > --- linux-2.6.17-rc1-mm2-full/sound/pci/maestro3.c.old 2006-04-17 02:52:43.000000000 +0200 > +++ linux-2.6.17-rc1-mm2-full/sound/pci/maestro3.c 2006-04-17 02:52:47.000000000 +0200 > @@ -39,11 +39,10 @@ > #include > #include > #include > #include > #include > -#include > #include > #include > #include > #include > #include > --- linux-2.6.17-rc1-mm2-full/sound/pci/mixart/mixart.c.old 2006-04-17 02:53:06.000000000 +0200 > +++ linux-2.6.17-rc1-mm2-full/sound/pci/mixart/mixart.c 2006-04-17 02:53:09.000000000 +0200 > @@ -26,11 +26,10 @@ > #include > #include > #include > #include > #include > -#include > > #include > #include > #include > #include > --- linux-2.6.17-rc1-mm2-full/sound/pci/pcxhr/pcxhr.c.old 2006-04-17 02:53:18.000000000 +0200 > +++ linux-2.6.17-rc1-mm2-full/sound/pci/pcxhr/pcxhr.c 2006-04-17 02:53:21.000000000 +0200 > @@ -28,11 +28,10 @@ > #include > #include > #include > #include > #include > -#include > > #include > #include > #include > #include > > > ------------------------------------------------------- > This SF.Net email is sponsored by xPML, a groundbreaking scripting language > that extends applications into web and mobile media. Attend the live webcast > and join the prime developer group breaking into this new coding territory! > http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/alsa-devel >