diff --git a/[refs] b/[refs]
index 0f6a419e94b2..64d37c6584af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dec02dea1c159b69aa88cbfe9c89b2b46eadd28f
+refs/heads/master: 36c1132e34bda9605ff89648f085abaddf83cf3d
diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig
index 4c1546f71d56..09394657926e 100644
--- a/trunk/drivers/video/Kconfig
+++ b/trunk/drivers/video/Kconfig
@@ -2277,7 +2277,7 @@ config XEN_FBDEV_FRONTEND
 	select FB_SYS_IMAGEBLIT
 	select FB_SYS_FOPS
 	select FB_DEFERRED_IO
-	select INPUT_XEN_KBDDEV_FRONTEND
+	select INPUT_XEN_KBDDEV_FRONTEND if INPUT_MISC
 	select XEN_XENBUS_FRONTEND
 	default y
 	help