Make synaptics support optional

Make synaptics support optional

[Pavel Machek]

Hi!

Synaptics support breaks mouse for me (HP omnibook xe3). I guess it
should have its own config option, and perhaps it should be marked
experimental...

What about this patch?
								Pavel

--- /usr/src/tmp/linux/drivers/input/mouse/Kconfig	2003-06-24 12:27:47.000000000 +0200
+++ /usr/src/linux/drivers/input/mouse/Kconfig	2003-07-08 12:33:47.000000000 +0200
@@ -30,6 +30,12 @@
 	  The module will be called psmouse. If you want to compile it as a
 	  module, say M here and read <file:Documentation/modules.txt>.
 
+config MOUSE_SYNAPTICS
+	tristate "Synaptics touchpad support"
+	depends on INPUT_MOUSE && MOUSE_PS2
+	help
+	  Say Y if you want your touchpad not to work any more.
+
 config MOUSE_SERIAL
 	tristate "Serial mouse"
 	depends on INPUT && INPUT_MOUSE && SERIO
@@ -134,4 +140,3 @@
 	  inserted in and removed from the running kernel whenever you want).
 	  The module will be called logibm.o. If you want to compile it as a
 	  module, say M here and read <file.:Documentation/modules.txt>.
-
--- /usr/src/tmp/linux/drivers/input/mouse/synaptics.c	2003-06-24 12:27:47.000000000 +0200
+++ /usr/src/linux/drivers/input/mouse/synaptics.c	2003-07-08 12:32:36.000000000 +0200
@@ -213,6 +213,9 @@
 {
 	struct synaptics_data *priv;
 
+#ifndef CONFIG_MOUSE_SYNAPTICS
+	return -1;
+#endif;
 	psmouse->private = priv = kmalloc(sizeof(struct synaptics_data), GFP_KERNEL);
 	if (!priv)
 		return -1;

-- 
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]

Re: Make synaptics support optional

[Vojtech Pavlik]

On Tue, Jul 08, 2003 at 12:45:51PM +0200, Pavel Machek wrote:
> Hi!
> 
> Synaptics support breaks mouse for me (HP omnibook xe3).

Read the kernel config help entry. If you mean external mouse, then
that's in the works.

> I guess it should have its own config option, and perhaps it should be
> marked experimental...

Probably yes.

> What about this patch?

Seems OK.

> 								Pavel
> 
> --- /usr/src/tmp/linux/drivers/input/mouse/Kconfig	2003-06-24 12:27:47.000000000 +0200
> +++ /usr/src/linux/drivers/input/mouse/Kconfig	2003-07-08 12:33:47.000000000 +0200
> @@ -30,6 +30,12 @@
>  	  The module will be called psmouse. If you want to compile it as a
>  	  module, say M here and read <file:Documentation/modules.txt>.
>  
> +config MOUSE_SYNAPTICS
> +	tristate "Synaptics touchpad support"
> +	depends on INPUT_MOUSE && MOUSE_PS2
> +	help
> +	  Say Y if you want your touchpad not to work any more.
> +
>  config MOUSE_SERIAL
>  	tristate "Serial mouse"
>  	depends on INPUT && INPUT_MOUSE && SERIO
> @@ -134,4 +140,3 @@
>  	  inserted in and removed from the running kernel whenever you want).
>  	  The module will be called logibm.o. If you want to compile it as a
>  	  module, say M here and read <file.:Documentation/modules.txt>.
> -
> --- /usr/src/tmp/linux/drivers/input/mouse/synaptics.c	2003-06-24 12:27:47.000000000 +0200
> +++ /usr/src/linux/drivers/input/mouse/synaptics.c	2003-07-08 12:32:36.000000000 +0200
> @@ -213,6 +213,9 @@
>  {
>  	struct synaptics_data *priv;
>  
> +#ifndef CONFIG_MOUSE_SYNAPTICS
> +	return -1;
> +#endif;
>  	psmouse->private = priv = kmalloc(sizeof(struct synaptics_data), GFP_KERNEL);
>  	if (!priv)
>  		return -1;
> 
> -- 
> When do you have a heart between your knees?
> [Johanka's followup: and *two* hearts?]

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR

Re: Make synaptics support optional

[Aaron Lehmann]

On Tue, Jul 08, 2003 at 12:45:51PM +0200, Pavel Machek wrote:
> --- /usr/src/tmp/linux/drivers/input/mouse/synaptics.c	2003-06-24 12:27:47.000000000 +0200
> +++ /usr/src/linux/drivers/input/mouse/synaptics.c	2003-07-08 12:32:36.000000000 +0200
> @@ -213,6 +213,9 @@
>  {
>  	struct synaptics_data *priv;
>  
> +#ifndef CONFIG_MOUSE_SYNAPTICS
> +	return -1;
> +#endif;
>  	psmouse->private = priv = kmalloc(sizeof(struct synaptics_data), GFP_KERNEL);
>  	if (!priv)
>  		return -1;
> 

Why not adjust the Makefiles?

Re: Make synaptics support optional

[Pavel Machek]

Hi!

> On Tue, Jul 08, 2003 at 12:45:51PM +0200, Pavel Machek wrote:
> > --- /usr/src/tmp/linux/drivers/input/mouse/synaptics.c	2003-06-24 12:27:47.000000000 +0200
> > +++ /usr/src/linux/drivers/input/mouse/synaptics.c	2003-07-08 12:32:36.000000000 +0200
> > @@ -213,6 +213,9 @@
> >  {
> >  	struct synaptics_data *priv;
> >  
> > +#ifndef CONFIG_MOUSE_SYNAPTICS
> > +	return -1;
> > +#endif;
> >  	psmouse->private = priv = kmalloc(sizeof(struct synaptics_data), GFP_KERNEL);
> >  	if (!priv)
> >  		return -1;
> > 
> 
> Why not adjust the Makefiles?

It was that way once in history, but later it was changed to "always
include". I wanted minimal change.
								Pavel
-- 
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]