From: johann d. <jd...@us...> - 2002-04-09 21:08:17
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input In directory usw-pr-cvs1:/tmp/cvs-serv25424/drivers/input Modified Files: mousedev.c Log Message: Fixes suggested by Rodrigo Damazio. Index: mousedev.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/mousedev.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- mousedev.c 22 Feb 2002 11:42:23 -0000 1.41 +++ mousedev.c 9 Apr 2002 20:51:26 -0000 1.42 @@ -38,6 +38,10 @@ #include <linux/config.h> #include <linux/smp_lock.h> #include <linux/random.h> +#include <linux/major.h> +#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX +#include <linux/miscdevice.h> +#endif MODULE_AUTHOR("Vojtech Pavlik <vo...@uc...>"); MODULE_DESCRIPTION("Mouse (ExplorerPS/2) device interfaces"); @@ -228,7 +232,7 @@ int i; #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX - if (major(inode->i_rdev) == MISC_MAJOR)) + if (major(inode->i_rdev) == MISC_MAJOR) i = MOUSEDEV_MIX; else #endif @@ -518,7 +522,7 @@ mousedev_mix.minor = MOUSEDEV_MIX; mousedev_mix.devfs = input_register_minor("mice", MOUSEDEV_MIX, MOUSEDEV_MINOR_BASE); #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX - misc_register(&psaux_mouse) + misc_register(&psaux_mouse); #endif printk(KERN_INFO "mice: PS/2 mouse device common for all mice\n"); @@ -529,7 +533,7 @@ static void __exit mousedev_exit(void) { #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX - misc_deregister(&psaux_mouse) + misc_deregister(&psaux_mouse); #endif input_unregister_minor(mousedev_mix.devfs); input_unregister_handler(&mousedev_handler); |