- input-psmouse-wrap-protocol-extensions-except-synaptics-with-ifdefs.patch removed from -mm tree

- input-psmouse-wrap-protocol-extensions-except-synaptics-with-ifdefs.patch removed from -mm tree

[akpm]

The patch titled
     input: psmouse: wrap protocol extensions (except synaptics) with ifdefs
has been removed from the -mm tree.  Its filename was
     input-psmouse-wrap-protocol-extensions-except-synaptics-with-ifdefs.patch

This patch was dropped because an updated version will be merged

------------------------------------------------------
Subject: input: psmouse: wrap protocol extensions (except synaptics) with ifdefs
From: Andres Salomon <dilinger@debian.org>

Allow ALPS, LOGIPS2PP, LIFEBOOK, and TRACKPOINT protocol extensions (in the
psmouse driver) to be disabled during compilation.  The synaptics stuff is
left alone for now, since it needs special handling for synaptic pass-through
ports.

Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/input/mouse/psmouse-base.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

diff -puN drivers/input/mouse/psmouse-base.c~input-psmouse-wrap-protocol-extensions-except-synaptics-with-ifdefs drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/psmouse-base.c~input-psmouse-wrap-protocol-extensions-except-synaptics-with-ifdefs
+++ a/drivers/input/mouse/psmouse-base.c
@@ -567,6 +567,7 @@ static int psmouse_extensions(struct psm
 {
 	int synaptics_hardware = 0;
 
+#ifdef CONFIG_MOUSE_PS2_LIFEBOOK
 /*
  * We always check for lifebook because it does not disturb mouse
  * (it only checks DMI information).
@@ -577,6 +578,7 @@ static int psmouse_extensions(struct psm
 				return PSMOUSE_LIFEBOOK;
 		}
 	}
+#endif
 
 /*
  * Try Kensington ThinkingMouse (we try first, because synaptics probe
@@ -608,6 +610,7 @@ static int psmouse_extensions(struct psm
 		synaptics_reset(psmouse);
 	}
 
+#ifdef CONFIG_MOUSE_PS2_ALPS
 /*
  * Try ALPS TouchPad
  */
@@ -622,15 +625,20 @@ static int psmouse_extensions(struct psm
 			max_proto = PSMOUSE_IMEX;
 		}
 	}
+#endif
 
 	if (max_proto > PSMOUSE_IMEX && genius_detect(psmouse, set_properties) == 0)
 		return PSMOUSE_GENPS;
 
+#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
 	if (max_proto > PSMOUSE_IMEX && ps2pp_init(psmouse, set_properties) == 0)
 		return PSMOUSE_PS2PP;
+#endif
 
+#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
 	if (max_proto > PSMOUSE_IMEX && trackpoint_detect(psmouse, set_properties) == 0)
 		return PSMOUSE_TRACKPOINT;
+#endif
 
 /*
  * Reset to defaults in case the device got confused by extended
@@ -672,12 +680,14 @@ static const struct psmouse_protocol psm
 		.maxproto	= 1,
 		.detect		= ps2bare_detect,
 	},
+#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
 	{
 		.type		= PSMOUSE_PS2PP,
 		.name		= "PS2++",
 		.alias		= "logitech",
 		.detect		= ps2pp_init,
 	},
+#endif
 	{
 		.type		= PSMOUSE_THINKPS,
 		.name		= "ThinkPS/2",
@@ -711,6 +721,7 @@ static const struct psmouse_protocol psm
 		.detect		= synaptics_detect,
 		.init		= synaptics_init,
 	},
+#ifdef CONFIG_MOUSE_PS2_ALPS
 	{
 		.type		= PSMOUSE_ALPS,
 		.name		= "AlpsPS/2",
@@ -718,18 +729,23 @@ static const struct psmouse_protocol psm
 		.detect		= alps_detect,
 		.init		= alps_init,
 	},
+#endif
+#ifdef CONFIG_MOUSE_PS2_LIFEBOOK
 	{
 		.type		= PSMOUSE_LIFEBOOK,
 		.name		= "LBPS/2",
 		.alias		= "lifebook",
 		.init		= lifebook_init,
 	},
+#endif
+#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
 	{
 		.type		= PSMOUSE_TRACKPOINT,
 		.name		= "TPPS/2",
 		.alias		= "trackpoint",
 		.detect		= trackpoint_detect,
 	},
+#endif
 	{
 		.type		= PSMOUSE_AUTO,
 		.name		= "auto",
_

Patches currently in -mm which might be from dilinger@debian.org are

input-psmouse-wrap-protocol-extensions-except-synaptics-with-ifdefs.patch
input-psmouse-allow-disabling-of-synaptics-protocol-extension.patch