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

[oweals/u-boot.git] / arch / powerpc / cpu / mpc8xx / i2c.c

diff --git a/arch/powerpc/cpu/mpc8xx/i2c.c b/arch/powerpc/cpu/mpc8xx/i2c.c
index 2f8b1393f232c983012d92478a483f17fe5b0f78..3dff4ab4ac426245733072b74fd321bb5291fed4 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/i2c.c
+++ b/arch/powerpc/cpu/mpc8xx/i2c.c
@@ -12,14 +12,12 @@
  */
 
 #include <common.h>
+#include <console.h>
 
 #ifdef CONFIG_HARD_I2C
 
 #include <commproc.h>
 #include <i2c.h>
-#ifdef CONFIG_LWMON
-#include <watchdog.h>
-#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -591,10 +589,6 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
        uchar xaddr[4];
        int rc;
 
-#ifdef CONFIG_LWMON
-       WATCHDOG_RESET();
-#endif
-
        xaddr[0] = (addr >> 24) & 0xFF;
        xaddr[1] = (addr >> 16) & 0xFF;
        xaddr[2] = (addr >> 8) & 0xFF;