Messages in this thread | | | Date | Mon, 17 Jun 2013 17:13:05 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the renesas tree with the sh tree |
| |
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) [unhandled content-type:application/pgp-signature] | |