aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042.c
diff options
context:
space:
mode:
authorRoland Dreier <rdreier@cisco.com>2008-03-10 03:08:43 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-03-14 11:53:52 -0400
commitd38501a379b7827a9bf916ba79d53f66c4ca7caa (patch)
tree70c26ef4dfc94637c0bf3ea284fee1398887da57 /drivers/input/serio/i8042.c
parentInput: cobalt_btns - assorted fixes (diff)
downloadlinux-dev-d38501a379b7827a9bf916ba79d53f66c4ca7caa.tar.xz
linux-dev-d38501a379b7827a9bf916ba79d53f66c4ca7caa.zip
Input: i8042 - fix warning on non-x86 builds
Commit c18bab80 ("Input: i8042 - non-x86 build fix") introduced the following warning on non-x86 builds: drivers/input/serio/i8042.c: In function 'i8042_probe': drivers/input/serio/i8042.c:1154: warning: unused variable 'param' Fix this by moving the parameter variable declaration into the #ifdef too. Signed-off-by: Roland Dreier <rolandd@cisco.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/i8042.c')
-rw-r--r--drivers/input/serio/i8042.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 2763394869d2..65a74cfc187b 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1151,7 +1151,6 @@ static int __devinit i8042_setup_kbd(void)
static int __devinit i8042_probe(struct platform_device *dev)
{
int error;
- char param;
error = i8042_controller_selftest();
if (error)
@@ -1174,7 +1173,7 @@ static int __devinit i8042_probe(struct platform_device *dev)
}
#ifdef CONFIG_X86
if (i8042_dritek) {
- param = 0x90;
+ char param = 0x90;
error = i8042_command(&param, 0x1059);
if (error)
goto out_fail;