diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-10 19:09:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-10 19:09:18 -0400 |
| commit | b79dadf846e5e140e261bbfa4decd024357702d7 (patch) | |
| tree | bbfed4207c806f34ceb4b608e62cc4fbfa98f91f /include/configs/dalmore.h | |
| parent | 1fc42018a0fe833a4332f8f32d6aeb675f3dcd1d (diff) | |
| parent | d5338c693e6a35a7108c184839d688a7377d117c (diff) | |
| download | u-boot-imx-b79dadf846e5e140e261bbfa4decd024357702d7.zip u-boot-imx-b79dadf846e5e140e261bbfa4decd024357702d7.tar.gz u-boot-imx-b79dadf846e5e140e261bbfa4decd024357702d7.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts:
README
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/dalmore.h')
| -rw-r--r-- | include/configs/dalmore.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 0b04ee6..5f5eb3b 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -32,8 +32,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_DALMORE -#define CONFIG_BOARD_EARLY_INIT_F - /* I2C */ #define CONFIG_SYS_I2C_TEGRA #define CONFIG_CMD_I2C |