Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[mv-sheeva.git] / drivers / input / mouse / lifebook.h

diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h
index 11489b45cee22ba05cb2fac3998f44edd784ffda..be1c0943825d85650894b9cd3f01d64c18eb3bc4 100644 (file)
--- a/drivers/input/mouse/lifebook.h
+++ b/drivers/input/mouse/lifebook.h
@@ -11,7 +11,7 @@
 #ifndef _LIFEBOOK_H
 #define _LIFEBOOK_H
 
-int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto, 
-                    int set_properties);
+int lifebook_detect(struct psmouse *psmouse, int set_properties);
+int lifebook_init(struct psmouse *psmouse);
 
 #endif