Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index 54cd91610174..fa97d3e7c21a 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -23,9 +23,13 @@
 #include <linux/errno.h>
 #include <linux/fb.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
+
 #include <asm/xen/hypervisor.h>
+
+#include <xen/xen.h>
 #include <xen/events.h>
 #include <xen/page.h>
 #include <xen/interface/io/fbif.h>
@@ -440,7 +444,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) {