diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-04 15:03:35 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-04 15:03:35 +0200 |
| commit | 01761bea1ce6539b97640123660c67d81c54318b (patch) | |
| tree | a9eb2957891081a1ae111b6c7f53a8d2108597b2 /serial/manager.c | |
| parent | 0019156df63264bdb80131f947833cd2a1293994 (diff) | |
| parent | 18614bd2b008cb9f3879990883c569c37b72f195 (diff) | |
Merge branch 'for-upstream' of git://gitorious.org/bluez/aloks-clone
Diffstat (limited to 'serial/manager.c')
| -rw-r--r-- | serial/manager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/serial/manager.c b/serial/manager.c index eb575d58..f4687ccd 100644 --- a/serial/manager.c +++ b/serial/manager.c @@ -77,7 +77,7 @@ static DBusConnection *connection = NULL; static int serial_probe(struct btd_device *device, sdp_record_t *rec, const char *name, const char *uuid) { - struct adapter *adapter = device_get_adapter(device); + struct btd_adapter *adapter = device_get_adapter(device); const gchar *path = device_get_path(device); sdp_list_t *protos; int ch; @@ -150,7 +150,7 @@ static struct btd_device_driver serial_dialup_driver = { .remove = dialup_remove, }; -static int proxy_probe(struct adapter *adapter) +static int proxy_probe(struct btd_adapter *adapter) { const char *path = adapter_get_path(adapter); const char *address = adapter_get_address(adapter); @@ -162,7 +162,7 @@ static int proxy_probe(struct adapter *adapter) return proxy_register(connection, path, &src); } -static void proxy_remove(struct adapter *adapter) +static void proxy_remove(struct btd_adapter *adapter) { const char *path = adapter_get_path(adapter); |