diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
commit | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (patch) | |
tree | 7ae4c607f6baae74060c2e385f744e171fbbf92b /drivers/video/arkfb.c | |
parent | 1aacc064e029f0017384e463121b98f06d3a2cc3 (diff) | |
parent | 8b53ef33d9d8fa5f771ae11cc6a6e7bc0182beec (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/video/arkfb.c')
-rw-r--r-- | drivers/video/arkfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c index 314d18694b6..d583bea608f 100644 --- a/drivers/video/arkfb.c +++ b/drivers/video/arkfb.c | |||
@@ -470,7 +470,7 @@ static void ark_dac_read_regs(void *data, u8 *code, int count) | |||
470 | 470 | ||
471 | while (count != 0) | 471 | while (count != 0) |
472 | { | 472 | { |
473 | vga_wseq(NULL, 0x1C, regval | (code[0] & 4) ? 0x80 : 0); | 473 | vga_wseq(NULL, 0x1C, regval | (code[0] & 4 ? 0x80 : 0)); |
474 | code[1] = vga_r(NULL, dac_regs[code[0] & 3]); | 474 | code[1] = vga_r(NULL, dac_regs[code[0] & 3]); |
475 | count--; | 475 | count--; |
476 | code += 2; | 476 | code += 2; |
@@ -485,7 +485,7 @@ static void ark_dac_write_regs(void *data, u8 *code, int count) | |||
485 | 485 | ||
486 | while (count != 0) | 486 | while (count != 0) |
487 | { | 487 | { |
488 | vga_wseq(NULL, 0x1C, regval | (code[0] & 4) ? 0x80 : 0); | 488 | vga_wseq(NULL, 0x1C, regval | (code[0] & 4 ? 0x80 : 0)); |
489 | vga_w(NULL, dac_regs[code[0] & 3], code[1]); | 489 | vga_w(NULL, dac_regs[code[0] & 3], code[1]); |
490 | count--; | 490 | count--; |
491 | code += 2; | 491 | code += 2; |