From b7c49162c3ae84498364c48a1e9b4f92e1580037 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Fri, 6 Jan 2012 10:43:09 +0100 Subject: [PATCH] --- yaml --- r: 293990 b: refs/heads/master c: 4bc25af79ec54b79266148f8c1b84bb1e7ff2621 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/Kconfig | 2 +- trunk/drivers/video/Kconfig | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0f1e8497ae82..eae2142603a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59a56802918100c1e39e68c30a2e5ae9f7d837f0 +refs/heads/master: 4bc25af79ec54b79266148f8c1b84bb1e7ff2621 diff --git a/trunk/drivers/input/misc/Kconfig b/trunk/drivers/input/misc/Kconfig index 7b46781c30c9..8f675ae20916 100644 --- a/trunk/drivers/input/misc/Kconfig +++ b/trunk/drivers/input/misc/Kconfig @@ -558,7 +558,7 @@ config INPUT_CMA3000_I2C config INPUT_XEN_KBDDEV_FRONTEND tristate "Xen virtual keyboard and mouse support" - depends on XEN_FBDEV_FRONTEND + depends on XEN default y select XEN_XENBUS_FRONTEND help diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index d83e967e4e15..269b29919567 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/drivers/video/Kconfig @@ -2269,6 +2269,7 @@ config XEN_FBDEV_FRONTEND select FB_SYS_IMAGEBLIT select FB_SYS_FOPS select FB_DEFERRED_IO + select INPUT_XEN_KBDDEV_FRONTEND select XEN_XENBUS_FRONTEND default y help