rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / drivers / i2c / omap24xx_i2c.c

diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 7dab78685dfb44102295a2cf138d49f48118b9ac..134dccb61005b9d6ab25428c6fec2de54308929b 100644 (file)
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -22,8 +22,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_DRIVER_OMAP24XX_I2C
-
 #include <asm/arch/i2c.h>
 #include <asm/io.h>
 
@@ -254,7 +252,7 @@ int i2c_read (uchar chip, uint addr, int alen, uchar * buffer, int len)
        for (i = 0; i < len; i++) {
                if (i2c_read_byte (chip, addr + i, &buffer[i])) {
                        printf ("I2C read: I/O error\n");
-                       i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
+                       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
                        return 1;
                }
        }
@@ -279,7 +277,7 @@ int i2c_write (uchar chip, uint addr, int alen, uchar * buffer, int len)
        for (i = 0; i < len; i++) {
                if (i2c_write_byte (chip, addr + i, buffer[i])) {
                        printf ("I2C read: I/O error\n");
-                       i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
+                       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
                        return 1;
                }
        }
@@ -325,5 +323,3 @@ static u16 wait_for_pin (void)
 }
        return status;
 }
-
-#endif /* CONFIG_DRIVER_OMAP24XX_I2C */