Merge branch 'upstream' into for-next

0a0c5d47 · Jiri Kosina · 7f25433c · 52cfc61b · 0a0c5d47
Commit 0a0c5d47 authored Aug 18, 2009 by Jiri Kosina
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/hid/usbhid/hid-core.c drivers/hid/usbhid/hid-core.c +2 -1

No files found.
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -489,7 +489,8 @@ static void hid_ctrl(struct urb *urb)
 	wake_up(&usbhid->wait);
 }

-void __usbhid_submit_report(struct hid_device *hid, struct hid_report *report, unsigned char dir)
+static void __usbhid_submit_report(struct hid_device *hid, struct hid_report *report,
+				   unsigned char dir)
 {
 	int head;
 	struct usbhid_device *usbhid = hid->driver_data;