Make synaptics support optional
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/linux/drivers/input/mouse/Kconfig renamed from usr/src/tmp/linux/drivers/input/mouse/Kconfig +6 -1
@@ -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/linux/drivers/input/mouse/synaptics.c renamed from usr/src/tmp/linux/drivers/input/mouse/synaptics.c +3 -0
@@ -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 ;
Signature · 2 lines
When do you have a heart between your knees? [Johanka's followup: and *two* hearts?]
Quoted 3 lines · Pavel Machek
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.
Quoted 2 lines
I guess it should have its own config option, and perhaps it should be marked experimental...
Probably yes.
Quoted 1 line
What about this patch?
Seems OK.
Quoted 38 lines
Pavel
usr/src/linux/drivers/input/mouse/Kconfig renamed from usr/src/tmp/linux/drivers/input/mouse/Kconfig +6
-1@@ -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/linux/drivers/input/mouse/synaptics.c renamed from usr/src/tmp/linux/drivers/input/mouse/synaptics.c +3
-0@@ -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 ;Signature · 3 lines
-- When do you have a heart between your knees? [Johanka's followup: and *two* hearts?]
Signature · 2 lines
Vojtech Pavlik SuSE Labs, SuSE CR
usr/src/linux/drivers/input/mouse/synaptics.c line 221
Quoted 13 lines · Pavel Machek
usr/src/linux/drivers/input/mouse/synaptics.c renamed from usr/src/tmp/linux/drivers/input/mouse/synaptics.c +3
-0@@ -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?
Hi!
Quoted 7 lines · Pavel Machek
Quoted 6 lines
usr/src/linux/drivers/input/mouse/synaptics.c renamed from usr/src/tmp/linux/drivers/input/mouse/synaptics.c +0
-0@@ -213,6 +213,9 @@ {struct synaptics_data *priv;
Quoted 9 lines
usr/src/linux/drivers/input/mouse/synaptics.c line 221
Quoted 7 lines
usr/src/linux/drivers/input/mouse/synaptics.c renamed from usr/src/tmp/linux/drivers/input/mouse/synaptics.c +3
-0+#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
Signature · 2 lines
When do you have a heart between your knees? [Johanka's followup: and *two* hearts?]