Merge branch 'autosuspend' into for-next
Jiri Kosina [Mon, 30 Mar 2009 13:14:53 +0000 (15:14 +0200)]
Conflicts:

drivers/hid/hid-core.c

1  2 
drivers/hid/hid-core.c
drivers/hid/usbhid/hid-core.c
drivers/hid/usbhid/hiddev.c
include/linux/hid.h

@@@ -1819,6 -1813,31 +1819,22 @@@ void hid_unregister_driver(struct hid_d
  }
  EXPORT_SYMBOL_GPL(hid_unregister_driver);
  
 -#ifdef CONFIG_HID_COMPAT
 -static void hid_compat_load(struct work_struct *ws)
 -{
 -      request_module("hid-dummy");
 -}
 -static DECLARE_WORK(hid_compat_work, hid_compat_load);
 -static struct workqueue_struct *hid_compat_wq;
 -#endif
 -
+ int hid_check_keys_pressed(struct hid_device *hid)
+ {
+       struct hid_input *hidinput;
+       int i;
+       list_for_each_entry(hidinput, &hid->inputs, list) {
+               for (i = 0; i < BITS_TO_LONGS(KEY_MAX); i++)
+                       if (hidinput->input->key[i])
+                               return 1;
+       }
+       return 0;
+ }
+ EXPORT_SYMBOL_GPL(hid_check_keys_pressed);
  static int __init hid_init(void)
  {
        int ret;
Simple merge
Simple merge
Simple merge