Merge branch 'master' of git://git.denx.de/u-boot-uniphier

[u-boot] / board / tqc / tqm5200 / cmd_stk52xx.c

diff --git a/board/tqc/tqm5200/cmd_stk52xx.c b/board/tqc/tqm5200/cmd_stk52xx.c
index 5f905d5dcaf5c87e714654bf3a655c555a173c1c..dc22ee4024804a84537eff7a75ea1dad2d36c261 100644 (file)
--- a/board/tqc/tqm5200/cmd_stk52xx.c
+++ b/board/tqc/tqm5200/cmd_stk52xx.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 
 #if defined(CONFIG_CMD_BSP)
 
@@ -71,7 +72,7 @@ static int spi_transmit(unsigned char data)
        spi->dr = data;
        /* wait for SPI transmission completed */
        while (!(spi->sr & 0x80)) {
-               if (spi->sr & 0x40) {   /* if write collision occured */
+               if (spi->sr & 0x40) {   /* if write collision occurred */
                        int dummy;
 
                        /* do dummy read to clear status register */