diff options
| author | Tom Rini <trini@ti.com> | 2013-07-24 09:22:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-24 09:50:24 -0400 |
| commit | c2120fbfbc4d1f6953228f86be8bdbf38bacfdab (patch) | |
| tree | 14cd8ec9a0a61f7113149be38d79808cd5e955f8 /board/nvidia | |
| parent | e85427fd66a21b39145a47e67871a8863c0e5591 (diff) | |
| parent | ecbd7e1ec7280d90d151a99691f74b892588cadd (diff) | |
| download | talos-obmc-uboot-c2120fbfbc4d1f6953228f86be8bdbf38bacfdab.tar.gz talos-obmc-uboot-c2120fbfbc4d1f6953228f86be8bdbf38bacfdab.zip | |
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 'board/nvidia')
| -rw-r--r-- | board/nvidia/common/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 5f72c02572..126e56e97a 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -135,7 +135,7 @@ int board_init(void) power_det_init(); -#ifdef CONFIG_TEGRA_I2C +#ifdef CONFIG_SYS_I2C_TEGRA #ifndef CONFIG_SYS_I2C_INIT_BOARD #error "You must define CONFIG_SYS_I2C_INIT_BOARD to use i2c on Nvidia boards" #endif @@ -149,7 +149,7 @@ int board_init(void) debug("Memory controller init failed: %d\n", err); # endif # endif /* CONFIG_TEGRA_PMU */ -#endif /* CONFIG_TEGRA_I2C */ +#endif /* CONFIG_SYS_I2C_TEGRA */ #ifdef CONFIG_USB_EHCI_TEGRA pin_mux_usb(); |
