Commit 2f5bf694 authored by Linus Torvalds's avatar Linus Torvalds

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

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents fc731434 e2fca851
...@@ -437,7 +437,7 @@ static struct pnp_driver serial_pnp_driver = { ...@@ -437,7 +437,7 @@ static struct pnp_driver serial_pnp_driver = {
.name = "serial", .name = "serial",
.id_table = pnp_dev_table, .id_table = pnp_dev_table,
.probe = serial_pnp_probe, .probe = serial_pnp_probe,
.remove = serial_pnp_remove, .remove = __devexit_p(serial_pnp_remove),
}; };
static int __init serial8250_pnp_init(void) static int __init serial8250_pnp_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment