diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/bluetooth/btsdio.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/bluetooth/btsdio.c')
| -rw-r--r-- | drivers/bluetooth/btsdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c index 7e298275c8f6..76e5127884f0 100644 --- a/drivers/bluetooth/btsdio.c +++ b/drivers/bluetooth/btsdio.c | |||
| @@ -326,7 +326,7 @@ static int btsdio_probe(struct sdio_func *func, | |||
| 326 | return -ENOMEM; | 326 | return -ENOMEM; |
| 327 | } | 327 | } |
| 328 | 328 | ||
| 329 | hdev->type = HCI_SDIO; | 329 | hdev->bus = HCI_SDIO; |
| 330 | hdev->driver_data = data; | 330 | hdev->driver_data = data; |
| 331 | 331 | ||
| 332 | data->hdev = hdev; | 332 | data->hdev = hdev; |