Merge bk://bk.arm.linux.org.uk/linux-2.6-serial

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2f5bf694 · Linus Torvalds · fc731434 · e2fca851 · 2f5bf694
Commit 2f5bf694 authored Jun 15, 2004 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/serial/8250_pnp.c drivers/serial/8250_pnp.c +1 -1

No files found.
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -437,7 +437,7 @@ static struct pnp_driver serial_pnp_driver = {
 	.name		= "serial",
 	.id_table	= pnp_dev_table,
 	.probe		= serial_pnp_probe,
-	.remove		= serial_pnp_remove,
+	.remove		= __devexit_p(serial_pnp_remove),
 };

 static int __init serial8250_pnp_init(void)