Merge with /home/sr/git/u-boot/cfi-flash

[u-boot] / board / sandburst / common / ppc440gx_i2c.c

diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c
index 858b38ceccd2e714b43b73a01be573f4b6bab80b..859dd7afe56bb1afbb7aa1b8341984098de5571f 100644 (file)
--- a/board/sandburst/common/ppc440gx_i2c.c
+++ b/board/sandburst/common/ppc440gx_i2c.c
@@ -451,9 +451,9 @@ int i2c_write1 (uchar chip, uint addr, int alen, uchar * buffer, int len)
  */
 uchar i2c_reg_read1(uchar i2c_addr, uchar reg)
 {
-       char buf;
+       uchar buf;
 
-       i2c_read1(i2c_addr, reg, 1, &buf, 1);
+       i2c_read1(i2c_addr, reg, 1, &buf, (uchar)1);
 
        return(buf);
 }