commit b0e668240949f69e84d69f998aa9af759e8be635
author Jiri Kosina <jkosina@suse.cz> Mon Dec 17 16:11:27 2007 +0100
committer Jiri Kosina <jkosina@suse.cz> Mon Jan 28 14:51:22 2008 +0100
tree a7996185476792af5fb9829b6e78a1d0a856eb45
parent 15b55fb879e901bbc0da05054b14ccbc2752a56a

HID: fix compilation of hidbp drivers without usbhid

We can use the blacklist only if usbhid code is compiled.

Reported-by: jurriaan <thunder7@xs4all.nl>
Cc: Pascal Terjan <pterjan@mandriva.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

drivers/hid/usbhid/usbkbd.c

diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index a31ccb4..5d9dbb4 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -235,11 +235,13 @@
 	if (!usb_endpoint_is_int_in(endpoint))
 		return -ENODEV;
 
+#ifdef CONFIG_USB_HID
 	if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
 				le16_to_cpu(dev->descriptor.idProduct))
 			& HID_QUIRK_IGNORE) {
 		return -ENODEV;
 	}
+#endif
 
 	pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
 	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));

drivers/hid/usbhid/usbmouse.c

diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index 8ff1b3f..df0d96d 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -131,11 +131,13 @@
 	if (!usb_endpoint_is_int_in(endpoint))
 		return -ENODEV;
 
+#ifdef CONFIG_USB_HID
 	if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
 				le16_to_cpu(dev->descriptor.idProduct))
 			& (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) {
 		return -ENODEV;
 	}
+#endif
 
 	pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
 	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));