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 <[email protected]>
>
> ---
>
> 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
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/alsa-devel
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
