summaryrefslogtreecommitdiffstats
path: root/drivers/video/controlfb.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-01-04 16:03:48 +0000
commit78c388aed2b7184182c08428db1de6c872d815f5 (patch)
tree4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/video/controlfb.h
parenteb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff)
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/video/controlfb.h')
-rw-r--r--drivers/video/controlfb.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/controlfb.h b/drivers/video/controlfb.h
index 2e138b7c7..32943ed27 100644
--- a/drivers/video/controlfb.h
+++ b/drivers/video/controlfb.h
@@ -141,8 +141,8 @@ static struct control_regvals control_reg_init_17 = {
1024, 768
};
-/* Register values for 1024x768, 72Hz mode (15) */
-static struct control_regvals control_reg_init_15 = {
+/* Register values for 1024x768, 72Hz mode (16 (15?)) */
+static struct control_regvals control_reg_init_16 = {
{ 1024, 2048, 4096 },
{ 0x10, 0x28, 0x50 },
{ 1607, 1604, 68, 39, 10, 1610, 1612, 132,
@@ -253,8 +253,8 @@ static struct control_regvals *control_reg_init[VMODE_MAX] = {
&control_reg_init_12,
&control_reg_init_13,
&control_reg_init_14,
- &control_reg_init_15,
- NULL,
+ &control_reg_init_16,
+ &control_reg_init_16,
&control_reg_init_17,
&control_reg_init_18,
&control_reg_init_19,