diff options
author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
---|---|---|
committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
commit | 521dcd30b9cc5b72cd27ae04104f19369251aa20 (patch) | |
tree | bc33710a3ae6f97f0dcae8f02fd6f3c91322d96d /common/cmd_i2c.c | |
parent | 260eea5676ca46903a335686cc020b29c4ca46fe (diff) | |
parent | 8d4f040a3c15036a6ea25a9c39e7d89fefa8440d (diff) | |
download | u-boot-imx-521dcd30b9cc5b72cd27ae04104f19369251aa20.zip u-boot-imx-521dcd30b9cc5b72cd27ae04104f19369251aa20.tar.gz u-boot-imx-521dcd30b9cc5b72cd27ae04104f19369251aa20.tar.bz2 |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
Diffstat (limited to 'common/cmd_i2c.c')
-rw-r--r-- | common/cmd_i2c.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index a684a58..10cab46 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -86,9 +86,6 @@ #include <i2c.h> #include <asm/byteorder.h> -#if defined(CONFIG_CMD_I2C) - - /* Display values from last command. * Memory modify remembered values are different from display memory. */ @@ -1024,5 +1021,3 @@ U_BOOT_CMD( " (valid chip values 50..57)\n" ); #endif - -#endif |