diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 18:34:40 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 18:34:40 +0100 |
commit | eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5 (patch) | |
tree | 34f7d08d5f9913c3b5c3bca152953a173ded1e05 /drivers/video/Kconfig | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tei... (diff) | |
parent | xen pvfb: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers. (diff) | |
download | linux-eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5.tar.xz linux-eae6fa9b0c3e2cb49cc157e906dd0ac52cfd7ca5.zip |
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/Kconfig')
-rw-r--r-- | drivers/video/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 6b89eb55ed32..e9f193e6b27e 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -2066,6 +2066,7 @@ config XEN_FBDEV_FRONTEND select FB_SYS_IMAGEBLIT select FB_SYS_FOPS select FB_DEFERRED_IO + select XEN_XENBUS_FRONTEND default y help This driver implements the front-end of the Xen virtual |