diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 12:34:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 12:34:40 -0500 |
| commit | eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5 (patch) | |
| tree | 34f7d08d5f9913c3b5c3bca152953a173ded1e05 /drivers/video/metronomefb.c | |
| parent | 02412f49f6a7e35753d9af49d92662fb562fc9fa (diff) | |
| parent | df11303c90406426847255ba498607f15a472a0a (diff) | |
Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xen pvfb: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
fb-defio: If FBINFO_VIRTFB is defined, do not set VM_IO flag.
Fix toogle whether xenbus driver should be built as module or part of kernel.
Diffstat (limited to 'drivers/video/metronomefb.c')
| -rw-r--r-- | drivers/video/metronomefb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c index df1f757a6161..661bfd20d194 100644 --- a/drivers/video/metronomefb.c +++ b/drivers/video/metronomefb.c | |||
| @@ -700,7 +700,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev) | |||
| 700 | if (retval < 0) | 700 | if (retval < 0) |
| 701 | goto err_free_irq; | 701 | goto err_free_irq; |
| 702 | 702 | ||
| 703 | info->flags = FBINFO_FLAG_DEFAULT; | 703 | info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB; |
| 704 | 704 | ||
| 705 | info->fbdefio = &metronomefb_defio; | 705 | info->fbdefio = &metronomefb_defio; |
| 706 | fb_deferred_io_init(info); | 706 | fb_deferred_io_init(info); |