diff options
| author | Jan Scholz <Scholz@fias.uni-frankfurt.de> | 2009-08-26 13:18:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-05 09:33:06 -0700 |
| commit | 1dbd009c9078b3491299722a9c0f1313fad0fc1b (patch) | |
| tree | b463e61f0e9d8b1aa6a555045dd7506b501cef6f | |
| parent | c1aa9d2b4debb5287bd42481cfb35c495b708bcd (diff) | |
| download | linux-stable-1dbd009c9078b3491299722a9c0f1313fad0fc1b.tar.gz linux-stable-1dbd009c9078b3491299722a9c0f1313fad0fc1b.tar.bz2 linux-stable-1dbd009c9078b3491299722a9c0f1313fad0fc1b.zip | |
HID: completely remove apple mightymouse from blacklist
commit 42960a13001aa6df52ca9952ce996f94a744ea65 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/hid/hid-core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 5eb10c2ce665..047844df992a 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) }, { } }; |