diff options
| author | Tom Rini <trini@ti.com> | 2013-07-24 17:22:28 +0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-24 17:50:24 +0400 |
| commit | c2120fbfbc4d1f6953228f86be8bdbf38bacfdab (patch) | |
| tree | 14cd8ec9a0a61f7113149be38d79808cd5e955f8 /include/configs/km/keymile-common.h | |
| parent | e85427fd66a21b39145a47e67871a8863c0e5591 (diff) | |
| parent | ecbd7e1ec7280d90d151a99691f74b892588cadd (diff) | |
| download | u-boot-c2120fbfbc4d1f6953228f86be8bdbf38bacfdab.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
The sandburst-specific i2c drivers have been deleted, conflict was just
over the SPDX conversion.
Conflicts:
board/sandburst/common/ppc440gx_i2c.c
board/sandburst/common/ppc440gx_i2c.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/km/keymile-common.h')
| -rw-r--r-- | include/configs/km/keymile-common.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index d0e4b3fd47..a82987d6a0 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -62,10 +62,7 @@ #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE -#define CONFIG_I2C_MULTI_BUS -#define CONFIG_SYS_MAX_I2C_BUS 1 #define CONFIG_SYS_I2C_INIT_BOARD -#define CONFIG_I2C_MUX /* Support the IVM EEprom */ #define CONFIG_SYS_IVM_EEPROM_ADR 0x50 |