| Message ID | 20170513135526.8380-1-marek.vasut+renesas@gmail.com |
|---|---|
| State | Accepted |
| Commit | b7cebcb9774cb60937ee00454288d4ad73f1c5ed |
| Delegated to: | Nobuhiro Iwamatsu |
| Headers | show |
Applied to rmobile branch, thanks! 2017-05-13 22:55 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>: > From: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> > > Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> > Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> > Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> > --- > drivers/serial/serial_sh.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h > index 348f544d0a..4d27122243 100644 > --- a/drivers/serial/serial_sh.h > +++ b/drivers/serial/serial_sh.h > @@ -226,7 +226,8 @@ struct uart_port { > # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ > #elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ > defined(CONFIG_R8A7792) || defined(CONFIG_R8A7793) || \ > - defined(CONFIG_R8A7794) || defined(CONFIG_R8A7795) > + defined(CONFIG_R8A7794) || defined(CONFIG_R8A7795) || \ > + defined(CONFIG_R8A7796) > # if defined(CONFIG_SCIF_A) > # define SCIF_ORER 0x0200 > # else > -- > 2.11.0 >
diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h index 348f544d0a..4d27122243 100644 --- a/drivers/serial/serial_sh.h +++ b/drivers/serial/serial_sh.h @@ -226,7 +226,8 @@ struct uart_port { # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ #elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ defined(CONFIG_R8A7792) || defined(CONFIG_R8A7793) || \ - defined(CONFIG_R8A7794) || defined(CONFIG_R8A7795) + defined(CONFIG_R8A7794) || defined(CONFIG_R8A7795) || \ + defined(CONFIG_R8A7796) # if defined(CONFIG_SCIF_A) # define SCIF_ORER 0x0200 # else