diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 09:34:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 09:34:40 -0800 |
| commit | eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5 (patch) | |
| tree | 34f7d08d5f9913c3b5c3bca152953a173ded1e05 /drivers/video/xen-fbfront.c | |
| parent | 02412f49f6a7e35753d9af49d92662fb562fc9fa (diff) | |
| parent | df11303c90406426847255ba498607f15a472a0a (diff) | |
| download | op-kernel-dev-eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5.zip op-kernel-dev-eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5.tar.gz | |
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/xen-fbfront.c')
| -rw-r--r-- | drivers/video/xen-fbfront.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c index 54cd916..91a68e9 100644 --- a/drivers/video/xen-fbfront.c +++ b/drivers/video/xen-fbfront.c @@ -440,7 +440,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, fb_info->fix.type = FB_TYPE_PACKED_PIXELS; fb_info->fix.accel = FB_ACCEL_NONE; - fb_info->flags = FBINFO_FLAG_DEFAULT; + fb_info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB; ret = fb_alloc_cmap(&fb_info->cmap, 256, 0); if (ret < 0) { |
