diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
| commit | 18ee3610040a4c008ce08a40a5dd025241cc7e97 (patch) | |
| tree | 32a996a5123726b63c31a1522f230933fb967a32 /arch/arm/mach-integrator/integrator_cp.c | |
| parent | e4e7b89280d1d666e2c09e5ad36cf071796c4c7e (diff) | |
| parent | b4103333d7904310d34de18d85e51e3d74f00a3b (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-integrator/integrator_cp.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 31820170f306..a0724f2b24ce 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
| @@ -469,7 +469,9 @@ static void cp_clcd_enable(struct clcd_fb *fb) | |||
| 469 | if (fb->fb.var.bits_per_pixel <= 8) | 469 | if (fb->fb.var.bits_per_pixel <= 8) |
| 470 | val = CM_CTRL_LCDMUXSEL_VGA_8421BPP; | 470 | val = CM_CTRL_LCDMUXSEL_VGA_8421BPP; |
| 471 | else if (fb->fb.var.bits_per_pixel <= 16) | 471 | else if (fb->fb.var.bits_per_pixel <= 16) |
| 472 | val = CM_CTRL_LCDMUXSEL_VGA_16BPP; | 472 | val = CM_CTRL_LCDMUXSEL_VGA_16BPP |
| 473 | | CM_CTRL_LCDEN0 | CM_CTRL_LCDEN1 | ||
| 474 | | CM_CTRL_STATIC1 | CM_CTRL_STATIC2; | ||
| 473 | else | 475 | else |
| 474 | val = 0; /* no idea for this, don't trust the docs */ | 476 | val = 0; /* no idea for this, don't trust the docs */ |
| 475 | 477 | ||