Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-microblaze.git] / drivers / bluetooth / btmrvl_main.c

diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 8d3d917..b280d46 100644 (file)
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -602,7 +602,7 @@ static int btmrvl_service_main_thread(void *data)
        struct btmrvl_thread *thread = data;
        struct btmrvl_private *priv = thread->priv;
        struct btmrvl_adapter *adapter = priv->adapter;
-       wait_queue_t wait;
+       wait_queue_entry_t wait;
        struct sk_buff *skb;
        ulong flags;