From 5a754fae96d8773f1c8e3321a6375d60c60ba653 Mon Sep 17 00:00:00 2001 From: JJ Ding Date: Tue, 20 Sep 2011 22:42:51 -0700 Subject: [PATCH] --- yaml --- r: 269477 b: refs/heads/master c: 4af61e90270e35bafa9e99a3c48fb3f363da592d h: refs/heads/master i: 269475: 44d19f0a088788c484d4049c59bdc6c9d6b06b5b v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/elantech.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index a82e58c62e7c..b84017e269ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84a90b610a1473d732818ec5d041ab18eae77f14 +refs/heads/master: 4af61e90270e35bafa9e99a3c48fb3f363da592d diff --git a/trunk/drivers/input/mouse/elantech.c b/trunk/drivers/input/mouse/elantech.c index c2d91ebbadf4..25290b395c88 100644 --- a/trunk/drivers/input/mouse/elantech.c +++ b/trunk/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) {