From 40420ebee6fe4b43ab21d480921c202a8a11cb22 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 30 Mar 2012 15:26:57 +0200
Subject: [PATCH] --- yaml --- r: 305047 b: refs/heads/master c:
 72f1367b5e15b80275d3805c9afc961549a12a1e h: refs/heads/master i:   305045:
 91df00e7a754327aa75104c9c7e45f07868a13fb   305043:
 9bacd14d22f51057365d2784c0e9fb50ae456f78   305039:
 57808606d86e68f9b8765cb34504d6d212aa57da v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/hid/hid-tivo.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d467a6c8e947..cf592818dbe2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8c52b662cef520815ed43cb3305f8b45b452694
+refs/heads/master: 72f1367b5e15b80275d3805c9afc961549a12a1e
diff --git a/trunk/drivers/hid/hid-tivo.c b/trunk/drivers/hid/hid-tivo.c
index de47039c708c..9f85f827607f 100644
--- a/trunk/drivers/hid/hid-tivo.c
+++ b/trunk/drivers/hid/hid-tivo.c
@@ -62,7 +62,7 @@ static int tivo_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 
 static const struct hid_device_id tivo_devices[] = {
 	/* TiVo Slide Bluetooth remote, pairs with a Broadcom dongle */
-	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },
 	{ }
 };