]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
sh: sh7722: Fix multiple definition of PSDR in serial_sh
authorNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Wed, 24 Nov 2010 04:24:33 +0000 (13:24 +0900)
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Tue, 11 Jan 2011 12:03:25 +0000 (21:03 +0900)
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
drivers/serial/serial_sh.h

index df21b37a8df634ab718326c377f4831bf33d49e8..54e94e5bf1134783beaf0299ec95ecf7c956b5ca 100644 (file)
@@ -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