summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorVincent Stehlé <vincent.stehle@laposte.net>2014-08-19 14:17:37 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-08-19 14:20:40 -0700
commitfb92be7ba8ca6be57b6595d2cb2d30a53b39417d (patch)
treefefc6ff1868cc65ba7e892f360b787d942727b9d /drivers/input
parentf5940231a5a27fa015aaff42db8dac05362d53bc (diff)
downloadlinux-next-fb92be7ba8ca6be57b6595d2cb2d30a53b39417d.tar.gz
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')
-rw-r--r--drivers/input/serio/i8042-sparcio.h3
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;
#define I8042_MUX_PHYS_DESC "sparcps2/serio%d"
static void __iomem *kbd_iobase;
-static struct resource *kbd_res;
#define I8042_COMMAND_REG (kbd_iobase + 0x64UL)
#define I8042_DATA_REG (kbd_iobase + 0x60UL)
@@ -44,6 +43,8 @@ static inline void i8042_write_command(int val)
#ifdef CONFIG_PCI
+static struct resource *kbd_res;
+
#define OBP_PS2KBD_NAME1 "kb_ps2"
#define OBP_PS2KBD_NAME2 "keyboard"
#define OBP_PS2MS_NAME1 "kdmouse"