From 99057064b375a9ec6f328452ec5f8bc60bd0b118 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 24 Nov 2010 13:24:33 +0900 Subject: sh: sh7722: Fix multiple definition of PSDR in serial_sh Signed-off-by: Nobuhiro Iwamatsu --- drivers/serial/serial_sh.h | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/serial/serial_sh.h') 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 -- cgit v1.2.3