From 565abb588f857c2c79c17429ba72de44de5da6ba Mon Sep 17 00:00:00 2001 From: Yi Sun Date: Mon, 20 Jul 2009 22:00:47 -0700 Subject: [PATCH] Input: disable synaptic touchpad by default It simulates a tochscreen and we can not support it. Disable it will trigger the system to use generic touchpad driver. --- drivers/input/mouse/Kconfig | 2 +- drivers/input/mouse/synaptics.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index 9c1e6ee83531..29457bd0dfe3 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig @@ -60,7 +60,7 @@ config MOUSE_PS2_LOGIPS2PP config MOUSE_PS2_SYNAPTICS bool "Synaptics PS/2 mouse protocol extension" if EXPERT - default y + default n depends on MOUSE_PS2 help Say Y here if you have a Synaptics PS/2 TouchPad connected to diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index aa186cf6c514..ed762eee1a57 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -66,6 +66,7 @@ static int synaptics_mode_cmd(struct psmouse *psmouse, unsigned char mode) int synaptics_detect(struct psmouse *psmouse, bool set_properties) { +#ifdef CONFIG_MOUSE_PS2_SYNAPTICS struct ps2dev *ps2dev = &psmouse->ps2dev; unsigned char param[4]; @@ -86,6 +87,9 @@ int synaptics_detect(struct psmouse *psmouse, bool set_properties) } return 0; +#else + return -ENODEV; +#endif } void synaptics_reset(struct psmouse *psmouse) -- 2.11.0