Merge commit 'v2.6.37-rc1' into for-2.6.37

[pandora-kernel.git] / drivers / bluetooth / btsdio.c

diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 76e5127..792e32d 100644 (file)
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -46,6 +46,9 @@ static const struct sdio_device_id btsdio_table[] = {
        /* Generic Bluetooth Type-B SDIO device */
        { SDIO_DEVICE_CLASS(SDIO_CLASS_BT_B) },
 
+       /* Generic Bluetooth AMP controller */
+       { SDIO_DEVICE_CLASS(SDIO_CLASS_BT_AMP) },
+
        { }     /* Terminating entry */
 };
 
@@ -329,6 +332,11 @@ static int btsdio_probe(struct sdio_func *func,
        hdev->bus = HCI_SDIO;
        hdev->driver_data = data;
 
+       if (id->class == SDIO_CLASS_BT_AMP)
+               hdev->dev_type = HCI_AMP;
+       else
+               hdev->dev_type = HCI_BREDR;
+
        data->hdev = hdev;
 
        SET_HCIDEV_DEV(hdev, &func->dev);