[LV-k25-commit] kernel-2.5/drivers/input/keyboard lkkbd.c,1.29,1.30

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/input/keyboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21108

Modified Files:
	lkkbd.c 
Log Message:
- Merge upstream suggestion (make init/exit function static, set device).


Index: lkkbd.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/input/keyboard/lkkbd.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- lkkbd.c	17 Nov 2004 00:19:11 -0000	1.29
+++ lkkbd.c	25 Feb 2005 18:06:16 -0000	1.30
@@ -685,6 +685,7 @@
 	lk->dev.id.vendor = SERIO_LKKBD;
 	lk->dev.id.product = 0;
 	lk->dev.id.version = 0x0100;
+	lk->dev.dev = &serio->dev;
 
 	input_register_device (&lk->dev);
 
@@ -718,17 +719,17 @@
 /*
  * The functions for insering/removing us as a module.
  */
-int __init
+static int __init
 lkkbd_init (void)
 {
-	serio_register_driver(&lkkbd_drv);
+	serio_register_driver (&lkkbd_drv);
 	return 0;
 }
 
-void __exit
+static void __exit
 lkkbd_exit (void)
 {
-	serio_unregister_driver(&lkkbd_drv);
+	serio_unregister_driver (&lkkbd_drv);
 }
 
 module_init (lkkbd_init);