aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Jones <drjones@redhat.com>2012-01-06 04:43:09 -0500
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-03-16 10:49:16 -0400
commit4bc25af79ec54b79266148f8c1b84bb1e7ff2621 (patch)
treebf1d6163820e4c0c3354a2f2949ded6ec9ebe80a
parent59a56802918100c1e39e68c30a2e5ae9f7d837f0 (diff)
xen kconfig: relax INPUT_XEN_KBDDEV_FRONTEND deps
PV-on-HVM guests may want to use the xen keyboard/mouse frontend, but they don't use the xen frame buffer frontend. For this case it doesn't make much sense for INPUT_XEN_KBDDEV_FRONTEND to depend on XEN_FBDEV_FRONTEND. The opposite direction always makes more sense, i.e. if you're using xenfb, then you'll want xenkbd. Switch the dependencies. Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Andrew Jones <drjones@redhat.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--drivers/input/misc/Kconfig2
-rw-r--r--drivers/video/Kconfig1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7b46781c30c9..8f675ae20916 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -558,7 +558,7 @@ config INPUT_CMA3000_I2C
558 558
559config INPUT_XEN_KBDDEV_FRONTEND 559config INPUT_XEN_KBDDEV_FRONTEND
560 tristate "Xen virtual keyboard and mouse support" 560 tristate "Xen virtual keyboard and mouse support"
561 depends on XEN_FBDEV_FRONTEND 561 depends on XEN
562 default y 562 default y
563 select XEN_XENBUS_FRONTEND 563 select XEN_XENBUS_FRONTEND
564 help 564 help
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d83e967e4e15..269b29919567 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2269,6 +2269,7 @@ config XEN_FBDEV_FRONTEND
2269 select FB_SYS_IMAGEBLIT 2269 select FB_SYS_IMAGEBLIT
2270 select FB_SYS_FOPS 2270 select FB_SYS_FOPS
2271 select FB_DEFERRED_IO 2271 select FB_DEFERRED_IO
2272 select INPUT_XEN_KBDDEV_FRONTEND
2272 select XEN_XENBUS_FRONTEND 2273 select XEN_XENBUS_FRONTEND
2273 default y 2274 default y
2274 help 2275 help