diff options
| author | Vincent Stehlé <vincent.stehle@laposte.net> | 2014-08-19 17:17:37 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-19 17:20:40 -0400 |
| commit | fb92be7ba8ca6be57b6595d2cb2d30a53b39417d (patch) | |
| tree | fefc6ff1868cc65ba7e892f360b787d942727b9d /drivers/input/serio | |
| parent | f5940231a5a27fa015aaff42db8dac05362d53bc (diff) | |
Input: sparc - i8042-sparcio.h: fix unused kbd_res warning
kbd_res is used only when CONFIG_PCI is defined; condition its declaration as
well. This fixes the following compilation warning:
drivers/input/serio/i8042-sparcio.h:20:25: warning: ‘kbd_res’ defined but not used [-Wunused-variable]
Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-sparcio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h index d6aa4c67dbb6..93cb7912703c 100644 --- a/drivers/input/serio/i8042-sparcio.h +++ b/drivers/input/serio/i8042-sparcio.h | |||
| @@ -17,7 +17,6 @@ static int i8042_aux_irq = -1; | |||
| 17 | #define I8042_MUX_PHYS_DESC "sparcps2/serio%d" | 17 | #define I8042_MUX_PHYS_DESC "sparcps2/serio%d" |
| 18 | 18 | ||
| 19 | static void __iomem *kbd_iobase; | 19 | static void __iomem *kbd_iobase; |
| 20 | static struct resource *kbd_res; | ||
| 21 | 20 | ||
| 22 | #define I8042_COMMAND_REG (kbd_iobase + 0x64UL) | 21 | #define I8042_COMMAND_REG (kbd_iobase + 0x64UL) |
| 23 | #define I8042_DATA_REG (kbd_iobase + 0x60UL) | 22 | #define I8042_DATA_REG (kbd_iobase + 0x60UL) |
| @@ -44,6 +43,8 @@ static inline void i8042_write_command(int val) | |||
| 44 | 43 | ||
| 45 | #ifdef CONFIG_PCI | 44 | #ifdef CONFIG_PCI |
| 46 | 45 | ||
| 46 | static struct resource *kbd_res; | ||
| 47 | |||
| 47 | #define OBP_PS2KBD_NAME1 "kb_ps2" | 48 | #define OBP_PS2KBD_NAME1 "kb_ps2" |
| 48 | #define OBP_PS2KBD_NAME2 "keyboard" | 49 | #define OBP_PS2KBD_NAME2 "keyboard" |
| 49 | #define OBP_PS2MS_NAME1 "kdmouse" | 50 | #define OBP_PS2MS_NAME1 "kdmouse" |
