summaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/logips2pp.h
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-05-11 21:03:13 +0200
committerWim Van Sebroeck <wim@iguana.be>2007-05-11 21:03:13 +0200
commit5c34202b8bf942da411b6599668a76b07449bbfd (patch)
tree5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/input/mouse/logips2pp.h
parent[WATCHDOG] iTCO_wdt.c - fix ACPI Base register (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff)
downloadlinux-5c34202b8bf942da411b6599668a76b07449bbfd.tar.xz
linux-5c34202b8bf942da411b6599668a76b07449bbfd.zip
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/input/mouse/logips2pp.h')
-rw-r--r--drivers/input/mouse/logips2pp.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/mouse/logips2pp.h b/drivers/input/mouse/logips2pp.h
index 64a8ec52ea6d..6e5712525fd6 100644
--- a/drivers/input/mouse/logips2pp.h
+++ b/drivers/input/mouse/logips2pp.h
@@ -11,6 +11,13 @@
#ifndef _LOGIPS2PP_H
#define _LOGIPS2PP_H
+#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
int ps2pp_init(struct psmouse *psmouse, int set_properties);
+#else
+inline int ps2pp_init(struct psmouse *psmouse, int set_properties)
+{
+ return -ENOSYS;
+}
+#endif /* CONFIG_MOUSE_PS2_LOGIPS2PP */
#endif