From: Mark Hemment <markhem@isildur.uk.xensource.com>
Date: Thu, 23 Apr 2009 13:32:48 +0000 (+0100)
Subject: Build support for PS/2 pass-through driver (pass2) for XenClient.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cdd4d6dbc1b2cce164ccba9800494b6c59588612;p=xenclient%2Fkernel.git

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

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 58223b5d..98df2464 100644
--- 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 1a6ff498..45d12463 100644
--- 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 98acf170..1b754768 100644
--- 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
index 00000000..c45f063a
--- /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
index 00000000..25e4bce4
--- /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