* [2.6 patch] sound/pci/: remove duplicate #include's
@ 2006-04-17 1:03 Adrian Bunk
2006-04-18 10:19 ` [Alsa-devel] " Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2006-04-17 1:03 UTC (permalink / raw)
To: perex; +Cc: alsa-devel, linux-kernel
There's no reason for #include'ing linux/dma-mapping.h more than once.
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Alsa-devel] [2.6 patch] sound/pci/: remove duplicate #include's
2006-04-17 1:03 [2.6 patch] sound/pci/: remove duplicate #include's Adrian Bunk
@ 2006-04-18 10:19 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2006-04-18 10:19 UTC (permalink / raw)
To: Adrian Bunk; +Cc: perex, alsa-devel, linux-kernel
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-04-18 10:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-17 1:03 [2.6 patch] sound/pci/: remove duplicate #include's Adrian Bunk
2006-04-18 10:19 ` [Alsa-devel] " Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox