diff options
author | Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> | 2010-11-24 13:24:33 +0900 |
---|---|---|
committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2011-01-11 21:03:25 +0900 |
commit | 99057064b375a9ec6f328452ec5f8bc60bd0b118 (patch) | |
tree | 6770f603e38881f0dc1a8b433cb24270e0057fed /drivers/serial | |
parent | efc0ba4395b1ce8341adbb302729b7a035663dd9 (diff) |
sh: sh7722: Fix multiple definition of PSDR in serial_sh
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/serial_sh.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h index df21b37a8d..54e94e5bf1 100644 --- a/drivers/serial/serial_sh.h +++ b/drivers/serial/serial_sh.h @@ -87,6 +87,7 @@ struct uart_port { # define SCSCR_INIT(port) 0x32 /* TIE=0,RIE=0,TE=1,RE=1,REIE=0,CKE=1 */ #elif defined(CONFIG_CPU_SH7722) # define PADR 0xA4050120 +# undef PSDR # define PSDR 0xA405013e # define PWDR 0xA4050166 # define PSCR 0xA405011E |