X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fsandburst%2Fcommon%2Fppc440gx_i2c.c;h=1e3dffb1ee11038f211379f8a6a4a235899af619;hb=ab4860b255239dbaecccdd002c8d11f4ef54dd75;hp=858b38ceccd2e714b43b73a01be573f4b6bab80b;hpb=05b47540aae996908e48e10a5ff8b69862aadef3;p=u-boot

diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c
index 858b38cecc..1e3dffb1ee 100644
--- a/board/sandburst/common/ppc440gx_i2c.c
+++ b/board/sandburst/common/ppc440gx_i2c.c
@@ -27,13 +27,8 @@
  */
 #include <common.h>
 #include <ppc4xx.h>
-#if defined(CONFIG_440)
-#   include <440_i2c.h>
-#else
-#   include <405gp_i2c.h>
-#endif
+#include <4xx_i2c.h>
 #include <i2c.h>
-#include <440_i2c.h>
 #include <command.h>
 #include "ppc440gx_i2c.h"
 
@@ -451,9 +446,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);
 }