* [PATCH] fbdev: sh_mobile_hdmi: fixup compile error
@ 2010-12-27 4:42 Kuninori Morimoto
2010-12-28 15:06 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Kuninori Morimoto @ 2010-12-27 4:42 UTC (permalink / raw)
To: Paul Mundt, Mark Brown; +Cc: Linux-SH, Linux-ALSA, Liam Girdwood
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
>> Paul
This patch is not needed for now on Paul's tree.
But seems to be needed after ALSA tree merge.
>> Mark, Liam
this patch is needed on current Mark's "for-2.6.38" tree.
drivers/video/sh_mobile_hdmi.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index d7df103..b19941d 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -22,6 +22,7 @@
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/workqueue.h>
+#include <sound/soc.h>
#include <sound/soc-dapm.h>
#include <sound/initval.h>
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] fbdev: sh_mobile_hdmi: fixup compile error
2010-12-27 4:42 [PATCH] fbdev: sh_mobile_hdmi: fixup compile error Kuninori Morimoto
@ 2010-12-28 15:06 ` Mark Brown
2010-12-29 6:25 ` Paul Mundt
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2010-12-28 15:06 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Paul Mundt, Linux-SH, Linux-ALSA, Liam Girdwood
On Mon, Dec 27, 2010 at 01:42:20PM +0900, Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> >> Paul
>
> This patch is not needed for now on Paul's tree.
> But seems to be needed after ALSA tree merge.
>
> >> Mark, Liam
>
> this patch is needed on current Mark's "for-2.6.38" tree.
Paul, do you want to apply this or shall I?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fbdev: sh_mobile_hdmi: fixup compile error
2010-12-28 15:06 ` Mark Brown
@ 2010-12-29 6:25 ` Paul Mundt
2010-12-29 13:33 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Paul Mundt @ 2010-12-29 6:25 UTC (permalink / raw)
To: Mark Brown; +Cc: Kuninori Morimoto, Linux-SH, Linux-ALSA, Liam Girdwood
On Tue, Dec 28, 2010 at 03:06:46PM +0000, Mark Brown wrote:
> On Mon, Dec 27, 2010 at 01:42:20PM +0900, Kuninori Morimoto wrote:
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > ---
> > >> Paul
> >
> > This patch is not needed for now on Paul's tree.
> > But seems to be needed after ALSA tree merge.
> >
> > >> Mark, Liam
> >
> > this patch is needed on current Mark's "for-2.6.38" tree.
>
> Paul, do you want to apply this or shall I?
It doesn't really matter to me, but since it seems to depend on your
merge perhaps it makes more sense to merge through the ALSA tree, simply
in terms of limiting bisect damage.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fbdev: sh_mobile_hdmi: fixup compile error
2010-12-29 6:25 ` Paul Mundt
@ 2010-12-29 13:33 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2010-12-29 13:33 UTC (permalink / raw)
To: Paul Mundt; +Cc: Kuninori Morimoto, Linux-SH, Linux-ALSA, Liam Girdwood
Applied, thanks. (Sorry about top posting, using my phone).
"Paul Mundt" <lethal@linux-sh.org> wrote:
>On Tue, Dec 28, 2010 at 03:06:46PM +0000, Mark Brown wrote:
>> On Mon, Dec 27, 2010 at 01:42:20PM +0900, Kuninori Morimoto wrote:
>> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>> > ---
>> > >> Paul
>> >
>> > This patch is not needed for now on Paul's tree.
>> > But seems to be needed after ALSA tree merge.
>> >
>> > >> Mark, Liam
>> >
>> > this patch is needed on current Mark's "for-2.6.38" tree.
>>
>> Paul, do you want to apply this or shall I?
>
>It doesn't really matter to me, but since it seems to depend on your
>merge perhaps it makes more sense to merge through the ALSA tree,
>simply
>in terms of limiting bisect damage.
--
Sent from my Android phone with K-9 Mail. Please excuse my brevity.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-12-29 13:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-27 4:42 [PATCH] fbdev: sh_mobile_hdmi: fixup compile error Kuninori Morimoto
2010-12-28 15:06 ` Mark Brown
2010-12-29 6:25 ` Paul Mundt
2010-12-29 13:33 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox