Commit d38501a3 authored by Roland Dreier's avatar Roland Dreier Committed by Dmitry Torokhov

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: default avatarRoland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 3c514387
...@@ -1151,7 +1151,6 @@ static int __devinit i8042_setup_kbd(void) ...@@ -1151,7 +1151,6 @@ static int __devinit i8042_setup_kbd(void)
static int __devinit i8042_probe(struct platform_device *dev) static int __devinit i8042_probe(struct platform_device *dev)
{ {
int error; int error;
char param;
error = i8042_controller_selftest(); error = i8042_controller_selftest();
if (error) if (error)
...@@ -1174,7 +1173,7 @@ static int __devinit i8042_probe(struct platform_device *dev) ...@@ -1174,7 +1173,7 @@ static int __devinit i8042_probe(struct platform_device *dev)
} }
#ifdef CONFIG_X86 #ifdef CONFIG_X86
if (i8042_dritek) { if (i8042_dritek) {
param = 0x90; char param = 0x90;
error = i8042_command(&param, 0x1059); error = i8042_command(&param, 0x1059);
if (error) if (error)
goto out_fail; goto out_fail;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment