From: Takashi Iwai <tiwai@suse.de>
To: Adrian Bunk <bunk@stusta.de>
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
Date: Tue, 18 Apr 2006 12:19:22 +0200 [thread overview]
Message-ID: <s5hfykb9oet.wl%tiwai@suse.de> (raw)
In-Reply-To: <20060417010341.GA7429@stusta.de>
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 <bunk@stusta.de>
>
> ---
>
> 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 <linux/dma-mapping.h>
> #include <linux/slab.h>
> #include <linux/interrupt.h>
> #include <linux/compiler.h>
> #include <linux/delay.h>
> -#include <linux/dma-mapping.h>
>
> #include <sound/driver.h>
> #include <sound/core.h>
> #include <sound/pcm.h>
> #include <sound/initval.h>
> --- 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 <linux/interrupt.h>
> #include <linux/pci.h>
> #include <linux/dma-mapping.h>
> #include <linux/slab.h>
> #include <linux/moduleparam.h>
> -#include <linux/dma-mapping.h>
> #include <sound/core.h>
> #include <sound/initval.h>
> #include <sound/pcm.h>
> #include <sound/ac97_codec.h>
> #include <sound/info.h>
> --- 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 <linux/pci.h>
> #include <linux/dma-mapping.h>
> #include <linux/slab.h>
> #include <linux/gameport.h>
> #include <linux/moduleparam.h>
> -#include <linux/dma-mapping.h>
> #include <linux/mutex.h>
>
> #include <sound/core.h>
> #include <sound/pcm.h>
> #include <sound/mpu401.h>
> --- 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 <linux/init.h>
> #include <linux/pci.h>
> #include <linux/dma-mapping.h>
> #include <linux/slab.h>
> #include <linux/moduleparam.h>
> -#include <linux/dma-mapping.h>
> #include <linux/mutex.h>
>
> #include <sound/core.h>
> #include <sound/cs8427.h>
> #include <sound/info.h>
> --- 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 <linux/pci.h>
> #include <linux/dma-mapping.h>
> #include <linux/slab.h>
> #include <linux/vmalloc.h>
> #include <linux/moduleparam.h>
> -#include <linux/dma-mapping.h>
> #include <sound/core.h>
> #include <sound/info.h>
> #include <sound/control.h>
> #include <sound/pcm.h>
> #include <sound/mpu401.h>
> --- 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 <linux/interrupt.h>
> #include <linux/pci.h>
> #include <linux/dma-mapping.h>
> #include <linux/moduleparam.h>
> #include <linux/mutex.h>
> -#include <linux/dma-mapping.h>
>
> #include <sound/core.h>
> #include <sound/initval.h>
> #include <sound/info.h>
> #include <sound/control.h>
> --- 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 <linux/pci.h>
> #include <linux/dma-mapping.h>
> #include <linux/delay.h>
> #include <linux/moduleparam.h>
> #include <linux/mutex.h>
> -#include <linux/dma-mapping.h>
>
> #include <sound/core.h>
> #include <sound/initval.h>
> #include <sound/info.h>
> #include <sound/control.h>
>
>
> -------------------------------------------------------
> 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
>
prev parent reply other threads:[~2006-04-18 10:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-17 1:03 Adrian Bunk
2006-04-18 10:19 ` Takashi Iwai [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5hfykb9oet.wl%tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=bunk@stusta.de \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®