From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 25 Oct 2011 07:54:16 +0000 (+0200)
Subject: Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into for... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b0eae38cebc54e618896d3e6a799939da51a8cac;p=linux.git

Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into for-linus
---

b0eae38cebc54e618896d3e6a799939da51a8cac
diff --cc drivers/hid/Kconfig
index 1130a89871251,342be43211d85,d2c97343fc0d5,3cbe8cc51ef3e,1130a89871251,9907dc9cfb122..2b006bfa09358
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@@@@@ -589,7 -589,6 -606,6 -590,6 -589,7 -589,8 +607,8 @@@@@@@ config HID_WACOM_POWER_SUPPL
      config HID_WIIMOTE
      	tristate "Nintendo Wii Remote support"
      	depends on BT_HIDP
 +++  	depends on LEDS_CLASS
+++++ 	select POWER_SUPPLY
      	---help---
      	Support for the Nintendo Wii Remote bluetooth device.