summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJan Scholz <Scholz@fias.uni-frankfurt.de>2009-08-26 13:18:51 +0200
committerJiri Kosina <jkosina@suse.cz>2009-08-26 13:18:51 +0200
commit42960a13001aa6df52ca9952ce996f94a744ea65 (patch)
treea1e536c38bea1eedd8c83e0f9404a9555003fd79 /drivers/hid
parent44cb2db10d05fc263c9fa44347d350d4f7f5890c (diff)
downloadkernel-crypto-42960a13001aa6df52ca9952ce996f94a744ea65.tar.gz
kernel-crypto-42960a13001aa6df52ca9952ce996f94a744ea65.tar.xz
kernel-crypto-42960a13001aa6df52ca9952ce996f94a744ea65.zip
HID: completely remove apple mightymouse from blacklist
Commit fa047e4f6fa63a6e9d0ae4d7749538830d14a343 "HID: fix inverted wheel for bluetooth version of apple mighty mouse" is incomplete. If we remove Apple MightyMouse (bluetooth version) from the list of apple_devices in drivers/hid/hid-apple.c we have to remove it from hid_blacklist in drivers/hid/hid-core.c as well. Signed-off-by: Jan Scholz <Scholz@fias.uni-frankfurt.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5eb10c2ce66..047844df992 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1319,7 +1319,6 @@ static const struct hid_device_id hid_blacklist[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
{ }
};