From 679cb87a468cf5ce8959571ff48428e0eec0a9f7 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Sat, 28 Jan 2006 20:54:50 +0000 Subject: [PATCH] --- yaml --- r: 19098 b: refs/heads/master c: 14e54cc391e22bd564993583464577e4e34a2701 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/integrator_cp.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 16909b004c0c..ddc700d390b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7efb83002bc20c5c72151d51468593834b510d71 +refs/heads/master: 14e54cc391e22bd564993583464577e4e34a2701 diff --git a/trunk/arch/arm/mach-integrator/integrator_cp.c b/trunk/arch/arm/mach-integrator/integrator_cp.c index 31820170f306..a0724f2b24ce 100644 --- a/trunk/arch/arm/mach-integrator/integrator_cp.c +++ b/trunk/arch/arm/mach-integrator/integrator_cp.c @@ -469,7 +469,9 @@ static void cp_clcd_enable(struct clcd_fb *fb) if (fb->fb.var.bits_per_pixel <= 8) val = CM_CTRL_LCDMUXSEL_VGA_8421BPP; else if (fb->fb.var.bits_per_pixel <= 16) - val = CM_CTRL_LCDMUXSEL_VGA_16BPP; + val = CM_CTRL_LCDMUXSEL_VGA_16BPP + | CM_CTRL_LCDEN0 | CM_CTRL_LCDEN1 + | CM_CTRL_STATIC1 | CM_CTRL_STATIC2; else val = 0; /* no idea for this, don't trust the docs */