git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pandora: update defconfig
[pandora-kernel.git]
/
drivers
/
serial
/
8250_acorn.c
diff --git
a/drivers/serial/8250_acorn.c
b/drivers/serial/8250_acorn.c
index
562ba74
..
b0ce8c5
100644
(file)
--- a/
drivers/serial/8250_acorn.c
+++ b/
drivers/serial/8250_acorn.c
@@
-54,7
+54,7
@@
serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
info->num_ports = type->num_ports;
bus_addr = ecard_resource_start(ec, type->type);
info->num_ports = type->num_ports;
bus_addr = ecard_resource_start(ec, type->type);
- info->vaddr =
ioremap(bus_addr, ecard_resource_len(ec, type->type)
);
+ info->vaddr =
ecardm_iomap(ec, type->type, 0, 0
);
if (!info->vaddr) {
kfree(info);
return -ENOMEM;
if (!info->vaddr) {
kfree(info);
return -ENOMEM;
@@
-91,7
+91,6
@@
static void __devexit serial_card_remove(struct expansion_card *ec)
if (info->ports[i] > 0)
serial8250_unregister_port(info->ports[i]);
if (info->ports[i] > 0)
serial8250_unregister_port(info->ports[i]);
- iounmap(info->vaddr);
kfree(info);
}
kfree(info);
}