* linux-next: manual merge of the renesas tree with the sh tree
@ 2013-06-17 7:13 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-06-17 7:13 UTC (permalink / raw)
To: Simon Horman
Cc: linux-next, linux-kernel, Ulrich Hecht, Bastian Hecht, Paul Mundt
[-- Attachment #1: Type: text/plain, Size: 922 bytes --]
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
include/linux/serial_sci.h between commit ada80ee7fa60 ("serial: sh-sci:
Add OF support") from the sh tree and commit 24610a30600b ("serial:
sh-sci: HSCIF support") from the renesas tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/serial_sci.h
index 857eec4,d340497..0000000
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@@ -18,8 -16,7 +18,9 @@@ enum
SCBRR_ALGO_3, /* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */
SCBRR_ALGO_4, /* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */
SCBRR_ALGO_5, /* (((clk * 1000 / 32) / bps) - 1) */
+ SCBRR_ALGO_6, /* HSCIF variable sample rate algorithm */
+
+ SCBRR_NR_ALGOS,
};
#define SCSCR_TIE (1 << 7)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-06-17 7:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-17 7:13 linux-next: manual merge of the renesas tree with the sh tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).