Skip to contentSkip to conversation

sound/soc/pxa/tosa.c: removed duplicated include

PATCH Huang Weiyi 3 participants 5 messages Jul 26, 2008 – Jul 28, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Removed duplicated include <asm/arch/tosa.h> in
sound/soc/pxa/tosa.c.

sound/soc/pxa/tosa.c +0 -1
index fe6cca9..22971a0 100644
@@ -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"
#1 lore raw
Quoted 2 lines · Huang Weiyi

Removed duplicated include <asm/arch/tosa.h> in
sound/soc/pxa/tosa.c.

Prior to your patch I see:

| $ grep include.*tosa.h sound/soc/pxa/tosa.c
| #include <asm/arch/tosa.h>

Where is the second inclusion?

#2 lore raw

On Sun, 27 Jul 2008 12:36:24 +0100
Mark Brown <[email protected]> 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.

Signature · 1 line
Huang Weiyi <[email protected]>
Acked-by
#3 lore raw
Quoted 2 lines · Huang Weiyi

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:

Signature · 1 line
"You grabbed my hand and we fell into it, like a daydream - or a fever."
#4 lore raw

At Sun, 27 Jul 2008 18:48:47 +0100,

Quoted 6 lines · Mark Brown
Quoted 2 lines · Huang Weiyi

In the commit 30d38542ec777468bb6a31829076a2dbc5690e35, duplicated include <asm/arch/tosa.h> was found in line 32 and 36.

Quoted 7 lines

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:

The relevant patch already hit Linus tree, so it's fine to apply the patch now :)

Takashi