diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-23 00:48:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-23 00:48:20 +0200 |
| commit | 46edbc545d1d0ae166271488e89c9967fb54393f (patch) | |
| tree | 90da2f5ff33a6fb194d83bea8a8ce4efd1f74e61 /include/i2c.h | |
| parent | f15f14e52879711be1d1bba2634dec684eda722e (diff) | |
| parent | caf72ff329759b4da71352ab098537c7698c0e9f (diff) | |
| download | u-boot-imx-46edbc545d1d0ae166271488e89c9967fb54393f.zip u-boot-imx-46edbc545d1d0ae166271488e89c9967fb54393f.tar.gz u-boot-imx-46edbc545d1d0ae166271488e89c9967fb54393f.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'include/i2c.h')
| -rw-r--r-- | include/i2c.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/i2c.h b/include/i2c.h index 668e754..b754769 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -47,7 +47,9 @@ #define I2C_RXTX_LEN 128 /* maximum tx/rx buffer length */ #if defined(CONFIG_I2C_MULTI_BUS) +#if !defined(CONFIG_SYS_MAX_I2C_BUS) #define CONFIG_SYS_MAX_I2C_BUS 2 +#endif #define I2C_GET_BUS() i2c_get_bus_num() #define I2C_SET_BUS(a) i2c_set_bus_num(a) #else |