diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-15 22:21:17 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-15 22:21:17 +0100 |
| commit | f8eab9c3e15db68d20cad8e257da228b518cde85 (patch) | |
| tree | 33b0e4ebcc0e32d448e54794089b31ada9f8b91f /include | |
| parent | 6b67962fd69ac0bcdf1a982669a029c2f0a7bcc1 (diff) | |
| parent | e7de18afe8ecf96a51ef981d06066eeb6b1254e7 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'include')
| -rw-r--r-- | include/i2c.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/i2c.h b/include/i2c.h index fad2d5716..f8a59a669 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -159,14 +159,7 @@ static inline u8 i2c_reg_read(u8 addr, u8 reg) printf("%s: addr=0x%02x, reg=0x%02x\n", __func__, addr, reg); #endif -#ifdef CONFIG_BLACKFIN - /* This ifdef will become unneccessary in a future version of the - * blackfin I2C driver. - */ - i2c_read(addr, reg, 0, &buf, 1); -#else i2c_read(addr, reg, 1, &buf, 1); -#endif return buf; } @@ -183,14 +176,7 @@ static inline void i2c_reg_write(u8 addr, u8 reg, u8 val) __func__, addr, reg, val); #endif -#ifdef CONFIG_BLACKFIN - /* This ifdef will become unneccessary in a future version of the - * blackfin I2C driver. - */ - i2c_write(addr, reg, 0, &val, 1); -#else i2c_write(addr, reg, 1, &val, 1); -#endif } /* |