Merge with /home/m8/git/u-boot

[kernel/u-boot.git] / cpu / mpc83xx / i2c.c

diff --git a/cpu/mpc83xx/i2c.c b/cpu/mpc83xx/i2c.c
index 94da4a9..4e70f80 100644 (file)
--- a/cpu/mpc83xx/i2c.c
+++ b/cpu/mpc83xx/i2c.c
@@ -41,7 +41,7 @@
 #include <i2c.h>
 #include <asm/i2c.h>
 
-#ifdef CONFIG_MPC8349ADS
+#if defined(CONFIG_MPC8349ADS) || defined(CONFIG_TQM834X)
 i2c_t * mpc8349_i2c = (i2c_t*)(CFG_IMMRBAR + CFG_I2C_OFFSET);
 #endif
 
@@ -109,6 +109,7 @@ i2c_wait (int write)
 
                return 0;
        } while (get_timer (timeval) < I2C_TIMEOUT);
+
        debug("i2c_wait: timed out\n");
        return -1;
 }