From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 30 Mar 2009 13:14:53 +0000 (+0200)
Subject: Merge branch 'autosuspend' into for-next
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=621de593081524da2f0f7b060f5951b4155eb4a2;p=linux-2.6-omap-h63xx.git

Merge branch 'autosuspend' into for-next

Conflicts:

	drivers/hid/hid-core.c
---

621de593081524da2f0f7b060f5951b4155eb4a2
diff --cc drivers/hid/hid-core.c
index e56f8d5d3a5,feaeb6167ea..5746a5903bc
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -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;