Re: prerelease-ac6 compile problem in serial.c

[Bill Nottingham]

Meelis Roos ([e-mail]) said: 
> 2.4.0-prerelease-ac6 doesn't compile serial on x86 with pnp enabled:
> 
> serial.c: In function `probe_serial_pnp':
> serial.c:5187: structure has no member named `device'
> serial.c:5192: structure has no member named `device'

Doh. I swear this did build when I tried it, although I don't see how.

Bill

--- linux/drivers/char/serial.c.foo	Thu Jan  4 17:31:43 2001
+++ linux/drivers/char/serial.c	Thu Jan  4 17:32:38 2001
@@ -5184,12 +5184,12 @@
 	       
 	       for (pnp_board = pnp_devices; pnp_board->vendor; pnp_board++)
 		       if ((dev->vendor == pnp_board->vendor) &&
-			   (dev->device == pnp_board->device))
+			   (dev->device == pnp_board->function))
 			       break;
 
 	       if (pnp_board->vendor) {
 		       board.vendor = pnp_board->vendor;
-		       board.device = pnp_board->device;
+		       board.device = pnp_board->function;
 		       /* Special case that's more efficient to hardcode */
 		       if ((board.vendor == ISAPNP_VENDOR('A', 'K', 'Y') &&
 			    board.device == ISAPNP_DEVICE(0x1021)))