Input: i8042 - fix warning on non-x86 builds
authorRoland Dreier <rdreier@cisco.com>
Mon, 10 Mar 2008 10:08:43 +0000 (03:08 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 14 Mar 2008 15:53:52 +0000 (11:53 -0400)
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>
drivers/input/serio/i8042.c

index 2763394869d2b59fb14dfbaaf584bdc80d22d785..65a74cfc187b12199bb3f291775e9223da504198 100644 (file)
@@ -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;