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 c3b267c4942cb0163e723d67df0dd2dd28679fab..859dd7afe56bb1afbb7aa1b8341984098de5571f 100644 (file)
--- a/board/sandburst/common/ppc440gx_i2c.c
+++ b/board/sandburst/common/ppc440gx_i2c.c
@@ -39,8 +39,6 @@
 
 #ifdef CONFIG_I2C_BUS1
 
-
-
 #define IIC_OK         0
 #define IIC_NOK                1
 #define IIC_NOK_LA     2               /* Lost arbitration */
@@ -453,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);
 }
@@ -511,5 +509,4 @@ U_BOOT_CMD(
        "\n    -discover valid I2C chip addresses\n"
 );
 
-#endif
-
+#endif /* CONFIG_I2C_BUS1 */