Merge tag 'dlm-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[deliverable/linux.git] / drivers / bluetooth / hci_h4.c

diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 748329468d26ca6432f6e04dc2d2ab92afd62e4f..c60623f206d4d255b59a29ea4de209a014e28421 100644 (file)
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -126,7 +126,7 @@ static int h4_enqueue(struct hci_uart *hu, struct sk_buff *skb)
 
 static inline int h4_check_data_len(struct h4_struct *h4, int len)
 {
-       register int room = skb_tailroom(h4->rx_skb);
+       int room = skb_tailroom(h4->rx_skb);
 
        BT_DBG("len %d room %d", len, room);