diff options
| author |   JJ Ding <jj_ding@emc.com.tw> | 2011-09-20 22:42:51 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-20 22:46:28 -0700 |
| commit | 4af61e90270e35bafa9e99a3c48fb3f363da592d (patch) | |
| tree | e5a7de6e4ee4239c0d979ff6ec532c054955b58a /drivers/input/mouse/elantech.c | |
| parent | Input: elantech - better support all those v2 variants (diff) | |
| download | linux-dev-4af61e90270e35bafa9e99a3c48fb3f363da592d.tar.xz linux-dev-4af61e90270e35bafa9e99a3c48fb3f363da592d.zip | |
Input: elantech - remove module parameter force_elantech
This essentially reverts commit f81bc788ff91d4efd4baf88b2c29713838caa8e5.
With recent work on elantech driver, I believe we now have complete support
for all elantech touchpads. So remove this hack.
Signed-off-by: JJ Ding <jj_ding@emc.com.tw>
Reviewed-by: Éric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse/elantech.c')
| -rw-r--r-- | drivers/input/mouse/elantech.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index c2d91ebbadf4..25290b395c88 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -28,10 +28,6 @@ printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); \ } while (0) -static bool force_elantech; -module_param_named(force_elantech, force_elantech, bool, 0644); -MODULE_PARM_DESC(force_elantech, "Force the Elantech PS/2 protocol extension to be used, 1 = enabled, 0 = disabled (default)."); - /* * Send a Synaptics style sliced query command */ @@ -1164,12 +1160,8 @@ int elantech_detect(struct psmouse *psmouse, bool set_properties) param[0], param[1], param[2]); if (!elantech_is_signature_valid(param)) { - if (!force_elantech) { - pr_debug("Probably not a real Elantech touchpad. Aborting.\n"); - return -1; - } - - pr_debug("Probably not a real Elantech touchpad. Enabling anyway due to force_elantech.\n"); + pr_debug("Probably not a real Elantech touchpad. Aborting.\n"); + return -1; } if (set_properties) { |