From 40627affbdfdacb1a2a3adc13641ec80ef4da09d Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Thu, 30 Aug 2007 00:44:33 -0400 Subject: [PATCH] --- yaml --- r: 64585 b: refs/heads/master c: b3e2c70cd0d05fb6621521521fbd5debed57d753 h: refs/heads/master i: 64583: 79222b0b428dcb7331ecb4a547255b33d77342d7 v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/touchkit_ps2.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 457d532967e3..b24461033af1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7460caf32a16866f9d8675aa7aefd7d82d1e23f7 +refs/heads/master: b3e2c70cd0d05fb6621521521fbd5debed57d753 diff --git a/trunk/drivers/input/mouse/touchkit_ps2.h b/trunk/drivers/input/mouse/touchkit_ps2.h index 61e9dfd8419f..8a0dd3574aef 100644 --- a/trunk/drivers/input/mouse/touchkit_ps2.h +++ b/trunk/drivers/input/mouse/touchkit_ps2.h @@ -15,7 +15,8 @@ #ifdef CONFIG_MOUSE_PS2_TOUCHKIT int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties); #else -inline int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties) +static inline int touchkit_ps2_detect(struct psmouse *psmouse, + int set_properties) { return -ENOSYS; }