Merge branch 'linux-2.6' into for-2.6.24

[linux-2.6-omap-h63xx.git] / drivers / input / mouse / lifebook.h

diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h
index 11489b45cee22ba05cb2fac3998f44edd784ffda..c1647cf036c25e8ebe7e0962f0139342f5af8dff 100644 (file)
--- a/drivers/input/mouse/lifebook.h
+++ b/drivers/input/mouse/lifebook.h
@@ -11,7 +11,18 @@
 #ifndef _LIFEBOOK_H
 #define _LIFEBOOK_H
 
-int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto, 
-                    int set_properties);
+#ifdef CONFIG_MOUSE_PS2_LIFEBOOK
+int lifebook_detect(struct psmouse *psmouse, int set_properties);
+int lifebook_init(struct psmouse *psmouse);
+#else
+inline int lifebook_detect(struct psmouse *psmouse, int set_properties)
+{
+       return -ENOSYS;
+}
+inline int lifebook_init(struct psmouse *psmouse)
+{
+       return -ENOSYS;
+}
+#endif
 
 #endif