diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-06-27 16:09:25 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-07-23 09:25:21 -0400 |
commit | dc25b78f21384f534a8a5da9600972aa9a51a680 (patch) | |
tree | e7a0b620c4a15a0aa15883189e1253bbe0d05019 /drivers/hid/usbhid/usbmouse.c | |
parent | 4db1c62c9991e62b441672db7f227e722776adc4 (diff) |
HID: fix quirk handling in usbmouse/kbd
When usbmouse/kbd is set to build, USB_HID is never defined due to
the USB_HID!=y Kconfig rule. Test CONFIG_USB_HID_MODULE in both
drivers instead.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid/usbmouse.c')
-rw-r--r-- | drivers/hid/usbhid/usbmouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c index 703e9d0e8714..f74740f92808 100644 --- a/drivers/hid/usbhid/usbmouse.c +++ b/drivers/hid/usbhid/usbmouse.c | |||
@@ -129,7 +129,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i | |||
129 | if (!usb_endpoint_is_int_in(endpoint)) | 129 | if (!usb_endpoint_is_int_in(endpoint)) |
130 | return -ENODEV; | 130 | return -ENODEV; |
131 | 131 | ||
132 | #ifdef CONFIG_USB_HID | 132 | #ifdef CONFIG_USB_HID_MODULE |
133 | if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor), | 133 | if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor), |
134 | le16_to_cpu(dev->descriptor.idProduct)) | 134 | le16_to_cpu(dev->descriptor.idProduct)) |
135 | & (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) { | 135 | & (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) { |