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/input | |
| 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/input')
| -rw-r--r-- | drivers/input/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 50af91ebd075..07c2cd43109c 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig | |||
| @@ -165,6 +165,7 @@ config XEN_KBDDEV_FRONTEND | |||
| 165 | tristate "Xen virtual keyboard and mouse support" | 165 | tristate "Xen virtual keyboard and mouse support" |
| 166 | depends on XEN_FBDEV_FRONTEND | 166 | depends on XEN_FBDEV_FRONTEND |
| 167 | default y | 167 | default y |
| 168 | select XEN_XENBUS_FRONTEND | ||
| 168 | help | 169 | help |
| 169 | This driver implements the front-end of the Xen virtual | 170 | This driver implements the front-end of the Xen virtual |
| 170 | keyboard and mouse device driver. It communicates with a back-end | 171 | keyboard and mouse device driver. It communicates with a back-end |