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/Kconfig | |
| 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/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 | |||
| 2066 | select FB_SYS_IMAGEBLIT | 2066 | select FB_SYS_IMAGEBLIT |
| 2067 | select FB_SYS_FOPS | 2067 | select FB_SYS_FOPS |
| 2068 | select FB_DEFERRED_IO | 2068 | select FB_DEFERRED_IO |
| 2069 | select XEN_XENBUS_FRONTEND | ||
| 2069 | default y | 2070 | default y |
| 2070 | help | 2071 | help |
| 2071 | This driver implements the front-end of the Xen virtual | 2072 | This driver implements the front-end of the Xen virtual |