Merge branch 'tx51-devel' into uboot-merge
authorLothar Waßmann <LW@KARO-electronics.de>
Wed, 5 Mar 2014 14:34:45 +0000 (15:34 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 5 Mar 2014 14:34:45 +0000 (15:34 +0100)
1  2 
board/karo/tx51/tx51.c
include/configs/tx51.h

@@@ -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;
Simple merge