diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 15:48:25 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 15:48:25 +0200 |
| commit | 019b57cc1d280c3768e2e8a7ff22e07a64c2f670 (patch) | |
| tree | 7b0d64f79797ce3bd493d9246fc2dd42aff63211 /arch/arm | |
| parent | e99f30e105a253ee64bef1ef83b86a47e0d3b6f1 (diff) | |
| parent | fe7b7cd26683b29bed407bf5ab778e8d80201d73 (diff) | |
| download | u-boot-imx-019b57cc1d280c3768e2e8a7ff22e07a64c2f670.zip u-boot-imx-019b57cc1d280c3768e2e8a7ff22e07a64c2f670.tar.gz u-boot-imx-019b57cc1d280c3768e2e8a7ff22e07a64c2f670.tar.bz2 | |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/armv7/tegra20/display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/tegra20/display.c b/arch/arm/cpu/armv7/tegra20/display.c index 488f0c6..fd77f3f 100644 --- a/arch/arm/cpu/armv7/tegra20/display.c +++ b/arch/arm/cpu/armv7/tegra20/display.c @@ -328,7 +328,7 @@ static int tegra_display_decode_config(const void *blob, rgb = fdt_subnode_offset(blob, node, "rgb"); config->panel_node = fdtdec_lookup_phandle(blob, rgb, "nvidia,panel"); - if (!config->panel_node < 0) { + if (config->panel_node < 0) { debug("%s: Cannot find panel information\n", __func__); return -1; } |