[alsa-devel] sound/soc/pxa/tosa.c: removed duplicated include
Removed duplicated include <asm/arch/tosa.h> in sound/soc/pxa/tosa.c.
Signed-off-by: Huang Weiyi weiyi.huang@gmail.com
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index fe6cca9..22971a0 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -33,7 +33,6 @@ #include <asm/arch/pxa-regs.h> #include <asm/arch/hardware.h> #include <asm/arch/audio.h> -#include <asm/arch/tosa.h>
#include "../codecs/wm9712.h" #include "pxa2xx-pcm.h"
On Sun, 27 Jul 2008 12:36:24 +0100 Mark Brown broonie@opensource.wolfsonmicro.com wrote:
broonie>On Sat, Jul 26, 2008 at 08:43:01PM +0800, Huang Weiyi wrote: broonie>> Removed duplicated include <asm/arch/tosa.h> in broonie>> sound/soc/pxa/tosa.c. broonie> broonie>Prior to your patch I see: broonie> broonie>| $ grep include.*tosa.h sound/soc/pxa/tosa.c broonie>| #include <asm/arch/tosa.h> broonie> broonie>Where is the second inclusion?
In the commit 30d38542ec777468bb6a31829076a2dbc5690e35, duplicated include <asm/arch/tosa.h> was found in line 32 and 36.
On Sun, Jul 27, 2008 at 09:04:43PM +0800, Huang Weiyi wrote:
In the commit 30d38542ec777468bb6a31829076a2dbc5690e35, duplicated include <asm/arch/tosa.h> was found in line 32 and 36.
Gah, right, I see. That patch introducing the duplicate went in via ARM tree and your fix can't be applied to ALSA until current mainline with that commit in it has been merged into ALSA. Please submit your patch to the ARM patch tracker for merge that way - that's probably the easiest thing here to do here:
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
At Sun, 27 Jul 2008 18:48:47 +0100, Mark Brown wrote:
On Sun, Jul 27, 2008 at 09:04:43PM +0800, Huang Weiyi wrote:
In the commit 30d38542ec777468bb6a31829076a2dbc5690e35, duplicated include <asm/arch/tosa.h> was found in line 32 and 36.
Gah, right, I see. That patch introducing the duplicate went in via ARM tree and your fix can't be applied to ALSA until current mainline with that commit in it has been merged into ALSA. Please submit your patch to the ARM patch tracker for merge that way - that's probably the easiest thing here to do here:
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
The relevant patch already hit Linus tree, so it's fine to apply the patch now :)
Takashi
participants (3)
-
Huang Weiyi -
Mark Brown -
Takashi Iwai