Build support for PS/2 pass-through driver (pass2) for XenClient.

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 58223b5d842a00059c9d6b0ee30a45417fd0961a..98df2464c9a695ba2dbe7386ae5de69dc1aa23bb 100644 (file)
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -143,6 +143,8 @@ source "drivers/input/touchscreen/Kconfig"
 
 source "drivers/input/misc/Kconfig"
 
+source "drivers/input/xen/Kconfig"
+
 endif
 
 menu "Hardware I/O ports"

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 1a6ff4982f302e124b67ad71b844131f0dabef93..45d1246359c58cb4103305496ef132f721d2b6bb 100644 (file)
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -17,3 +17,4 @@ obj-$(CONFIG_INPUT_MOUSE)     += mouse/
 obj-$(CONFIG_INPUT_JOYSTICK)   += joystick/
 obj-$(CONFIG_INPUT_TOUCHSCREEN)        += touchscreen/
 obj-$(CONFIG_INPUT_MISC)       += misc/
+obj-$(CONFIG_INPUT_XEN)                += xen/

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 98acf170252cfa351d67294d20dc960210a1e207..1b754768fbc5bcce2d6dd4c32a91419b77a63b81 100644 (file)
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -19,7 +19,7 @@ config SERIO
 if SERIO
 
 config SERIO_I8042
-       tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
+       tristate "i8042 PC Keyboard controller" if EMBEDDED || X86
        default y
        depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K
        ---help---

diff --git a/drivers/input/xen/Kconfig b/drivers/input/xen/Kconfig
new file mode 100644 (file)
index 0000000..c45f063
--- /dev/null
+++ b/drivers/input/xen/Kconfig
@@ -0,0 +1,25 @@
+#
+# Mouse driver configuration
+#
+menuconfig INPUT_XEN
+       bool "XEN"
+       default n
+       help
+         Say Y here for input devices specific to Xen.
+         This option doesn't affect the kernel.
+
+         If unsure, say N.
+
+if INPUT_XEN
+
+config XEN_8042
+       tristate "8042 KBD and Mouse"
+       default y
+       ---help---
+         Say Y here if you have a PS/2 keyboard and/or mouse connected to
+         your system that you wish to virtualize between Xen Client guests.
+         If unsure, say Y.
+
+         To compile this driver as a module, choose M here: the
+         module will be called pass2 (for pass-through PS/2).
+endif

diff --git a/drivers/input/xen/Makefile b/drivers/input/xen/Makefile
new file mode 100644 (file)
index 0000000..25e4bce
--- /dev/null
+++ b/drivers/input/xen/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for Xen Client input devices.
+#
+
+obj-$(CONFIG_XEN_8042)         += pass2.o
+
+xeninput-objs  := pass2.o