Dmitry Torokhov wrote:
> On 12/13/06, Andres Salomon <[EMAIL PROTECTED]> wrote:
>>
>> Alright, I guess we're down to a matter of taste then. I'll change the
>> patch to still have a monolithic psmouse that allows protocols to be
>> enabled/disabled via Kconfig.
>>
>
> That'd be great. Thanks!
>
Yikes, almost forgot to send this. Here you go; 3 patches total.
Please let me know if there are any other change. The first is attached.
>From 3238fbc61c7879c38d750b710dd009560b815ab4 Mon Sep 17 00:00:00 2001
From: Andres Salomon <[EMAIL PROTECTED]>
Date: Tue, 26 Dec 2006 16:24:57 -0500
Subject: [PATCH] Create PS/2 protocol options for Kconfig
Initial framework for disabling PS/2 protocol extensions. The current
protocols can only be disabled if CONFIG_EMBEDDED is selected. No source
files are changed w/ this patch, merely build stuff.
Signed-off-by: Andres Salomon <[EMAIL PROTECTED]>
---
drivers/input/mouse/Kconfig | 50 ++++++++++++++++++++++++++++++++++++++++++
drivers/input/mouse/Makefile | 22 ++++++++++++++++++
2 files changed, 71 insertions(+), 1 deletions(-)
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 35d998c..498930d 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -37,6 +37,56 @@ config MOUSE_PS2
To compile this driver as a module, choose M here: the
module will be called psmouse.
+config MOUSE_PS2_ALPS
+ bool "ALPS PS/2 mouse protocol extension" if EMBEDDED
+ default y
+ depends on MOUSE_PS2
+ ---help---
+ Say Y here if you have an ALPS PS/2 touchpad connected to
+ your system.
+
+ If unsure, say Y.
+
+config MOUSE_PS2_LOGIPS2PP
+ bool "Logictech PS/2++ mouse protocol extension" if EMBEDDED
+ default y
+ depends on MOUSE_PS2
+ ---help---
+ Say Y here if you have a Logictech PS/2++ mouse connected to
+ your system.
+
+ If unsure, say Y.
+
+config MOUSE_PS2_SYNAPTICS
+ bool "Synaptics PS/2 mouse protocol extension" if EMBEDDED
+ default y
+ depends on MOUSE_PS2
+ ---help---
+ Say Y here if you have a Synaptics PS/2 TouchPad connected to
+ your system.
+
+ If unsure, say Y.
+
+config MOUSE_PS2_LIFEBOOK
+ bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED
+ default y
+ depends on MOUSE_PS2
+ ---help---
+ Say Y here if you have a Fujitsu B-series Lifebook PS/2
+ TouchScreen connected to your system.
+
+ If unsure, say Y.
+
+config MOUSE_PS2_TRACKPOINT
+ bool "IBM Trackpoint PS/2 mouse protocol extension" if EMBEDDED
+ default y
+ depends on MOUSE_PS2
+ ---help---
+ Say Y here if you have an IBM Trackpoint PS/2 mouse connected
+ to your system.
+
+ If unsure, say Y.
+
config MOUSE_SERIAL
tristate "Serial mouse"
select SERIO
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
index 21a1de6..e7c7fbb 100644
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -14,4 +14,24 @@ obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o
obj-$(CONFIG_MOUSE_HIL) += hil_ptr.o
obj-$(CONFIG_MOUSE_VSXXXAA) += vsxxxaa.o
-psmouse-objs := psmouse-base.o alps.o logips2pp.o synaptics.o lifebook.o
trackpoint.o
+psmouse-objs := psmouse-base.o
+
+ifeq ($(CONFIG_MOUSE_PS2_ALPS),y)
+psmouse-objs += alps.o
+endif
+
+ifeq ($(CONFIG_MOUSE_PS2_LOGIPS2PP),y)
+psmouse-objs += logips2pp.o
+endif
+
+ifeq ($(CONFIG_MOUSE_PS2_SYNAPTICS),y)
+psmouse-objs += synaptics.o
+endif
+
+ifeq ($(CONFIG_MOUSE_PS2_LIFEBOOK),y)
+psmouse-objs += lifebook.o
+endif
+
+ifeq ($(CONFIG_MOUSE_PS2_TRACKPOINT),y)
+psmouse-objs += trackpoint.o
+endif
--
1.4.1
