summaryrefslogtreecommitdiffstats
path: root/input/manager.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-09-04 15:03:35 +0200
committerMarcel Holtmann <marcel@holtmann.org>2008-09-04 15:03:35 +0200
commit01761bea1ce6539b97640123660c67d81c54318b (patch)
treea9eb2957891081a1ae111b6c7f53a8d2108597b2 /input/manager.c
parent0019156df63264bdb80131f947833cd2a1293994 (diff)
parent18614bd2b008cb9f3879990883c569c37b72f195 (diff)
Merge branch 'for-upstream' of git://gitorious.org/bluez/aloks-clone
Diffstat (limited to 'input/manager.c')
-rw-r--r--input/manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/input/manager.c b/input/manager.c
index 68b4c1c1..dfd2da3a 100644
--- a/input/manager.c
+++ b/input/manager.c
@@ -173,7 +173,7 @@ static void input_remove(struct btd_device *device, const char *uuid)
static int hid_probe(struct btd_device *device, GSList *records)
{
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
const gchar *path = device_get_path(device);
const char *source, *destination;
struct hidp_connadd_req hidp;
@@ -213,7 +213,7 @@ static void hid_remove(struct btd_device *device)
static int headset_probe(struct btd_device *device, GSList *records)
{
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
const gchar *path = device_get_path(device);
sdp_record_t *record = records->data;
sdp_list_t *protos;