diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/video/vt8623fb.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/vt8623fb.c')
| -rw-r--r-- | drivers/video/vt8623fb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index 3df17dc8c3d7..d31dc96f838a 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| 21 | #include <linux/slab.h> | ||
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 23 | #include <linux/fb.h> | 22 | #include <linux/fb.h> |
| 24 | #include <linux/svga.h> | 23 | #include <linux/svga.h> |
| @@ -446,7 +445,7 @@ static int vt8623fb_set_par(struct fb_info *info) | |||
| 446 | 445 | ||
| 447 | svga_wseq_mask(0x1E, 0xF0, 0xF0); // DI/DVP bus | 446 | svga_wseq_mask(0x1E, 0xF0, 0xF0); // DI/DVP bus |
| 448 | svga_wseq_mask(0x2A, 0x0F, 0x0F); // DI/DVP bus | 447 | svga_wseq_mask(0x2A, 0x0F, 0x0F); // DI/DVP bus |
| 449 | svga_wseq_mask(0x16, 0x08, 0xBF); // FIFO read treshold | 448 | svga_wseq_mask(0x16, 0x08, 0xBF); // FIFO read threshold |
| 450 | vga_wseq(NULL, 0x17, 0x1F); // FIFO depth | 449 | vga_wseq(NULL, 0x17, 0x1F); // FIFO depth |
| 451 | vga_wseq(NULL, 0x18, 0x4E); | 450 | vga_wseq(NULL, 0x18, 0x4E); |
| 452 | svga_wseq_mask(0x1A, 0x08, 0x08); // enable MMIO ? | 451 | svga_wseq_mask(0x1A, 0x08, 0x08); // enable MMIO ? |