commit 4df4ed633c2a4ee988064c4a18a0787157b6599d
author Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Wed Nov 24 13:24:33 2010 +0900
committer Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Tue Jan 11 21:03:25 2011 +0900
tree 6770f603e38881f0dc1a8b433cb24270e0057fed
parent 45682ae4e189f89aaa326e93fbadc448fabfafb7

sh: sh7722: Fix multiple definition of PSDR in serial_sh

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>

drivers/serial/serial_sh.h

diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h
index df21b37..54e94e5 100644
--- a/drivers/serial/serial_sh.h
+++ b/drivers/serial/serial_sh.h
@@ -87,6 +87,7 @@
 # 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