git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[safe/jmp/linux-2.6]
/
drivers
/
video
/
xen-fbfront.c
diff --git
a/drivers/video/xen-fbfront.c
b/drivers/video/xen-fbfront.c
index
54cd916
..
603598f
100644
(file)
--- a/
drivers/video/xen-fbfront.c
+++ b/
drivers/video/xen-fbfront.c
@@
-25,7
+25,10
@@
#include <linux/module.h>
#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/vmalloc.h>
#include <linux/mm.h>
+
#include <asm/xen/hypervisor.h>
#include <asm/xen/hypervisor.h>
+
+#include <xen/xen.h>
#include <xen/events.h>
#include <xen/page.h>
#include <xen/interface/io/fbif.h>
#include <xen/events.h>
#include <xen/page.h>
#include <xen/interface/io/fbif.h>
@@
-440,7
+443,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->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) {
ret = fb_alloc_cmap(&fb_info->cmap, 256, 0);
if (ret < 0) {