]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - drivers/hid/usbhid/hid-core.c
Merge branch 'master' into upstream
[linux-2.6.git] / drivers / hid / usbhid / hid-core.c
index e2997a8d5e1b4b726ac9b62f0d60e2647ae37ce4..54060741d45b2ceddca10bb6a64dbd6af0071afb 100644 (file)
@@ -5,7 +5,7 @@
  *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
  *  Copyright (c) 2007-2008 Oliver Neukum
- *  Copyright (c) 2006-2009 Jiri Kosina
+ *  Copyright (c) 2006-2010 Jiri Kosina
  */
 
 /*
@@ -1342,7 +1342,7 @@ static int hid_reset_resume(struct usb_interface *intf)
 
 #endif /* CONFIG_PM */
 
-static struct usb_device_id hid_usb_ids [] = {
+static const struct usb_device_id hid_usb_ids[] = {
        { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
                .bInterfaceClass = USB_INTERFACE_CLASS_HID },
        { }                                             /* Terminating entry */