summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2015-10-27 13:06:27 +0100
committerJiri Slaby <jslaby@suse.cz>2015-10-28 16:38:37 +0100
commitce0c9313b7dd8b929c0c778f591a21dcf699a20b (patch)
tree1a1f72206fe19dc82c7e85b549839c73fe61cad7 /drivers
parentf79bd0cc3bc2c6c09ffb684f120cb3c54316c812 (diff)
Revert "USB: Add device quirk for ASUS T100 Base Station keyboard"
This reverts commit e25ecd21ffdbf1f8287103ccf97205fc30088344 in 3.12, upstream commit ddbe1fca0bcb87ca8c199ea873a456ca8a948567 (USB: Add device quirk for ASUS T100 Base Station keyboard). It was applied twice to 3.12 and one backport is bogus. Cc: Lu Baolu <baolu.lu@linux.intel.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/core/quirks.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 7aa445de8413..08f321904fb7 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -207,10 +207,6 @@ static const struct usb_device_id usb_interface_quirk_list[] = {
{ USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0),
.driver_info = USB_QUIRK_RESET_RESUME },
- /* ASUS Base Station(T100) */
- { USB_DEVICE(0x0b05, 0x17e0), .driver_info =
- USB_QUIRK_IGNORE_REMOTE_WAKEUP },
-
{ } /* terminating entry must be last */
};