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-Tag: v3.2-rc1~187^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0eae38cebc54e618896d3e6a799939da51a8cac;p=platform%2Fkernel%2Flinux-exynos.git

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

b0eae38cebc54e618896d3e6a799939da51a8cac
diff --cc drivers/hid/Kconfig
index 1130a89,342be43,d2c9734,3cbe8cc,1130a89,9907dc9..2b006bf
--- 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.