diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 17:58:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 17:58:08 -0400 |
| commit | 1a3f2ea336b784d7df750a7821f514f3dea69e29 (patch) | |
| tree | b7c2f5c7cc841d9f7b38fbdf03219b80dba97ea2 /drivers | |
| parent | e1d7e7fcf8625857de6b48975096c127e5cb1534 (diff) | |
| parent | 6ba60d2195cd65d72eaf7ce3903a707c5bf20c7b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix O_CLOEXEC values.
[SPARC32]: Fix modular build of floppy driver.
[SOUND] CS4231 SBus: Two fixes.
[CG6]: fix memory size detection
[SPARC64]: Add missing dma_sync_single_range_for_*().
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/cg6.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 87c747123538..ee9046db9c7d 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c | |||
| @@ -677,6 +677,7 @@ static int __devinit cg6_probe(struct of_device *op, const struct of_device_id * | |||
| 677 | struct fb_info *info; | 677 | struct fb_info *info; |
| 678 | struct cg6_par *par; | 678 | struct cg6_par *par; |
| 679 | int linebytes, err; | 679 | int linebytes, err; |
| 680 | int dblbuf; | ||
| 680 | 681 | ||
| 681 | info = framebuffer_alloc(sizeof(struct cg6_par), &op->dev); | 682 | info = framebuffer_alloc(sizeof(struct cg6_par), &op->dev); |
| 682 | 683 | ||
| @@ -698,7 +699,9 @@ static int __devinit cg6_probe(struct of_device *op, const struct of_device_id * | |||
| 698 | linebytes = of_getintprop_default(dp, "linebytes", | 699 | linebytes = of_getintprop_default(dp, "linebytes", |
| 699 | info->var.xres); | 700 | info->var.xres); |
| 700 | par->fbsize = PAGE_ALIGN(linebytes * info->var.yres); | 701 | par->fbsize = PAGE_ALIGN(linebytes * info->var.yres); |
| 701 | if (of_find_property(dp, "dblbuf", NULL)) | 702 | |
| 703 | dblbuf = of_getintprop_default(dp, "dblbuf", 0); | ||
| 704 | if (dblbuf) | ||
| 702 | par->fbsize *= 4; | 705 | par->fbsize *= 4; |
| 703 | 706 | ||
| 704 | par->fbc = of_ioremap(&op->resource[0], CG6_FBC_OFFSET, | 707 | par->fbc = of_ioremap(&op->resource[0], CG6_FBC_OFFSET, |