summaryrefslogtreecommitdiff
path: root/linux/pcmcia-cs/glue
diff options
context:
space:
mode:
Diffstat (limited to 'linux/pcmcia-cs/glue')
-rw-r--r--linux/pcmcia-cs/glue/ds.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/pcmcia-cs/glue/ds.c b/linux/pcmcia-cs/glue/ds.c
index 733e4b6..8f88b55 100644
--- a/linux/pcmcia-cs/glue/ds.c
+++ b/linux/pcmcia-cs/glue/ds.c
@@ -91,7 +91,7 @@ struct mach_socket_device {
static void
-device_deallocate(void *p)
+ds_device_deallocate(void *p)
{
mach_device_t device = (mach_device_t) p;
@@ -146,7 +146,7 @@ dev_to_port(void *d)
ipc_port_t port = ipc_port_make_send(dev->port);
- device_deallocate(dev);
+ ds_device_deallocate(dev);
return port;
}
@@ -441,8 +441,8 @@ device_get_status(void *d, dev_flavor_t req, dev_status_t arg,
struct device_emulation_ops linux_pcmcia_emulation_ops =
{
- mach_device_reference,
- device_deallocate,
+ (void*) mach_device_reference,
+ ds_device_deallocate,
dev_to_port,
device_open,
device_close,