From 2910ee14aec6b8573acb1f86aef6c801f5e8da1e Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Tue, 13 Mar 2012 09:36:05 +0100 Subject: [PATCH] --- yaml --- r: 291671 b: refs/heads/master c: 740363fb75f421f9a00a183f673b477c3029b572 h: refs/heads/master i: 291669: 1d96438e741f195d63eb6952b56b6a5f14a67b4c 291667: 1ddef98e3af7c227b37c6c89144737b7dcba94f6 291663: a83638ec15906a48123c17e5c54fb0abb0c939c4 v: v3 --- [refs] | 2 +- trunk/drivers/hid/Kconfig | 2 +- trunk/drivers/hid/hid-core.c | 1 + trunk/drivers/hid/hid-ids.h | 1 + trunk/drivers/hid/hid-tivo.c | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 30e6953a444c..f7aab7ebaa0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b1968d5b6e223237bca98879f31c5616b3b325f +refs/heads/master: 740363fb75f421f9a00a183f673b477c3029b572 diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig index 838fa6a3a287..3d14e4f6bac1 100644 --- a/trunk/drivers/hid/Kconfig +++ b/trunk/drivers/hid/Kconfig @@ -610,7 +610,7 @@ config SMARTJOYPLUS_FF config HID_TIVO tristate "TiVo Slide Bluetooth remote control support" - depends on USB_HID + depends on (USB_HID || BT_HIDP) ---help--- Say Y if you have a TiVo Slide Bluetooth remote control. diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index fbecdd3e7cd3..95095e5568a4 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -1546,6 +1546,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) }, + { 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) }, { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) }, { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) }, diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h index afe878f36ec3..5dcda615da36 100644 --- a/trunk/drivers/hid/hid-ids.h +++ b/trunk/drivers/hid/hid-ids.h @@ -661,6 +661,7 @@ #define USB_VENDOR_ID_THRUSTMASTER 0x044f #define USB_VENDOR_ID_TIVO 0x150a +#define USB_DEVICE_ID_TIVO_SLIDE_BT 0x1200 #define USB_DEVICE_ID_TIVO_SLIDE 0x1201 #define USB_VENDOR_ID_TOPSEED 0x0766 diff --git a/trunk/drivers/hid/hid-tivo.c b/trunk/drivers/hid/hid-tivo.c index 3d43c06dfffa..de47039c708c 100644 --- a/trunk/drivers/hid/hid-tivo.c +++ b/trunk/drivers/hid/hid-tivo.c @@ -62,6 +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_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) }, { } };