From: Kenn H. <ke...@us...> - 2005-08-01 23:43:30
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/char In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32653/drivers/vax/char Modified Files: dz.c Log Message: Get dz.c to compile again after serio changes in 2.6.12 Index: dz.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/char/dz.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- dz.c 25 Apr 2005 09:37:12 -0000 1.4 +++ dz.c 1 Aug 2005 23:43:06 -0000 1.5 @@ -1346,16 +1346,16 @@ #ifdef CONFIG_SERIO memset (&info->serio, 0, sizeof (struct serio)); info->serio.port_data = info; - info->serio.type = SERIO_RS232; + info->serio.id.type = SERIO_RS232; switch (i) { case DZ_KEYBOARD: - info->serio.type |= SERIO_LKKBD; + info->serio.id.type |= SERIO_LKKBD; sprintf (info->serio.name, "dzkbd"); sprintf (info->serio.phys, "dz/line0"); break; case DZ_MOUSE: - info->serio.type |= SERIO_VSXXXAA; + info->serio.id.type |= SERIO_VSXXXAA; sprintf (info->serio.name, "dzmouse"); sprintf (info->serio.phys, "dz/line1"); break; |