Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

[u-boot] / board / linkstation / hwctl.c

diff --git a/board/linkstation/hwctl.c b/board/linkstation/hwctl.c
index 9db128a83fd7fb9dbd8f96b73cc5b4f601540a30..d2090be1ad5a53f74233bca5af7c623f67cfc515 100644 (file)
--- a/board/linkstation/hwctl.c
+++ b/board/linkstation/hwctl.c
@@ -19,15 +19,13 @@
 #include <command.h>
 #include <asm/io.h>
 
-#define mdelay(n)      udelay((n)*1000)
-
-#define AVR_PORT CFG_NS16550_COM2
+#define AVR_PORT CONFIG_SYS_NS16550_COM2
 
 /* 2005.5.10 BUFFALO add */
 /*--------------------------------------------------------------*/
 static inline void miconCntl_SendUart(unsigned char dat)
 {
-       out_8((char *)AVR_PORT, dat);
+       out_8((unsigned char *)AVR_PORT, dat);
        mdelay(1);
 }