[SERIAL] Don't use UPF_AUTOPROBE, fix two build problems.

The curse of the missing __devexit_p() returns, and asm-*/ obviously
marks the end of the comment.

drivers/serial/8250.c

@@ -2178,7 +2178,7 @@ void serial8250_resume_port(int line)
 /*
  * Register a set of serial devices attached to a platform device.  The
  * list is terminated with a zero flags entry, which means we expect
- * all entries to have at least UPF_AUTOPROBE set.
+ * all entries to have at least UPF_BOOT_AUTOCONF set.
  */
 static int __devinit serial8250_probe(struct device *dev)
 {
@@ -2262,14 +2262,14 @@ static struct device_driver serial8250_isa_driver = {
 	.name		= "serial8250",
 	.bus		= &platform_bus_type,
 	.probe		= serial8250_probe,
-	.remove		= serial8250_remove,
+	.remove		= __devexit_p(serial8250_remove),
 	.suspend	= serial8250_suspend,
 	.resume		= serial8250_resume,
 };
 
 /*
  * This "device" covers _all_ ISA 8250-compatible serial devices listed
- * in the table in include/asm-*/serial.h
+ * in the table in include/asm/serial.h
  */
 static struct platform_device *serial8250_isa_devs;
 

drivers/serial/8250_acorn.c

@@ -65,7 +65,7 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
 
 	memset(&port, 0, sizeof(struct uart_port));
 	port.irq	= ec->irq;
-	port.flags	= UPF_AUTOPROBE | UPF_SHARE_IRQ;
+	port.flags	= UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
 	port.uartclk	= type->uartclk;
 	port.iotype	= UPIO_MEM;
 	port.regshift	= 2;

drivers/serial/8250_pci.c

@@ -1689,7 +1689,7 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
 		struct uart_port serial_port;
 		memset(&serial_port, 0, sizeof(struct uart_port));
 
-		serial_port.flags = UPF_SKIP_TEST | UPF_AUTOPROBE |
+		serial_port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF |
 				    UPF_SHARE_IRQ;
 		serial_port.uartclk = board->base_baud * 16;
 		serial_port.irq = get_pci_irq(dev, board, i);