From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Wed, 5 Mar 2014 14:34:45 +0000 (+0100)
Subject: Merge branch 'tx51-devel' into uboot-merge
X-Git-Tag: KARO-TX6-2014-03-07~13
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=4cf72669d1d11f29c0c1797ee725a896e6ba07e1

Merge branch 'tx51-devel' into uboot-merge
---

4cf72669d1d11f29c0c1797ee725a896e6ba07e1
diff --cc board/karo/tx51/tx51.c
index 40f5598039,7e3bb68798..eff52076dd
--- a/board/karo/tx51/tx51.c
+++ b/board/karo/tx51/tx51.c
@@@ -791,10 -800,8 +805,9 @@@ void lcd_ctrl_init(void *lcdbase
  	}
  
  	karo_fdt_move_fdt();
 +	lcd_bl_polarity = karo_fdt_get_backlight_polarity(working_fdt);
  
- 	vm = getenv("video_mode");
- 	if (vm == NULL) {
+ 	if (video_mode == NULL) {
  		debug("Disabling LCD\n");
  		lcd_enabled = 0;
  		return;