From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Takashi Iwai <tiwai@suse.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Paul Mundt <lethal@linux-sh.org>
Subject: linux-next: manual merge of the sound tree with the Linus' tree
Date: Mon, 6 Dec 2010 11:35:42 +1100 [thread overview]
Message-ID: <20101206113542.b1d2f978.sfr@canb.auug.org.au> (raw)
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/sh/fsi.c between commit
d4bc99b977e3a1dd10a84a01ebe59ac2ccebf0cd ("ARM: mach-shmobile: ap4evb:
FSI clock use proper process for HDMI") from Linus' tree and commit
2b0e73025f74699e9cc9df60649fcc14cd02481b ("ASoC: sh: fsi: change
fsi->mst_ctrl to master->a/b_mclk") from the sound tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc sound/soc/sh/fsi.c
index 4c2404b,19a2f99..0000000
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@ -131,10 -142,6 +142,8 @@@ struct fsi_priv
struct fsi_stream playback;
struct fsi_stream capture;
+
+ long rate;
-
- u32 mst_ctrl;
};
struct fsi_core {
next reply other threads:[~2010-12-06 0:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-06 0:35 Stephen Rothwell [this message]
2010-12-06 1:30 ` Kuninori Morimoto
2010-12-06 8:02 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101206113542.b1d2f978.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®