From 0f58184d45c852d8c0ce8d9ca37948974c0fb55e Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 22 Nov 2011 22:52:15 +0100
Subject: [PATCH] --- yaml --- r: 282289 b: refs/heads/master c:
 6cf851d803a17aa43edc23f9ec57378c041fddfb h: refs/heads/master i:   282287:
 533775d87b4ee74a94ba985e92f0c90c8abd4395 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/hid/Kconfig  | 12 ++++++------
 trunk/drivers/hid/Makefile |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 79d0e138f07c..19564e2662a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b95f5bcb811e3905b5376f87789da8d097fee682
+refs/heads/master: 6cf851d803a17aa43edc23f9ec57378c041fddfb
diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig
index 387bb532e135..f5aa4a0bbffb 100644
--- a/trunk/drivers/hid/Kconfig
+++ b/trunk/drivers/hid/Kconfig
@@ -560,6 +560,12 @@ config GREENASIA_FF
 	(like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter
 	and want to enable force feedback support for it.
 
+config HID_HYPERV_MOUSE
+	tristate "Microsoft Hyper-V mouse driver"
+	depends on HYPERV
+	---help---
+	Select this option to enable the Hyper-V mouse driver.
+
 config HID_SMARTJOYPLUS
 	tristate "SmartJoy PLUS PS2/USB adapter support"
 	depends on USB_HID
@@ -643,12 +649,6 @@ config HID_ZYDACRON
 	---help---
 	Support for Zydacron remote control.
 
-config HYPERV_MOUSE
-	tristate "Microsoft Hyper-V mouse driver"
-	depends on HYPERV
-	---help---
-	Select this option to enable the Hyper-V mouse driver.
-
 endmenu
 
 endif # HID_SUPPORT
diff --git a/trunk/drivers/hid/Makefile b/trunk/drivers/hid/Makefile
index fbb1ee6ff2ff..eed64f4214a2 100644
--- a/trunk/drivers/hid/Makefile
+++ b/trunk/drivers/hid/Makefile
@@ -38,6 +38,7 @@ obj-$(CONFIG_HID_ELECOM)	+= hid-elecom.o
 obj-$(CONFIG_HID_EZKEY)		+= hid-ezkey.o
 obj-$(CONFIG_HID_GYRATION)	+= hid-gyration.o
 obj-$(CONFIG_HID_HOLTEK)	+= hid-holtekff.o
+obj-$(CONFIG_HID_HYPERV_MOUSE)	+= hid-hyperv.o
 obj-$(CONFIG_HID_KENSINGTON)	+= hid-kensington.o
 obj-$(CONFIG_HID_KEYTOUCH)	+= hid-keytouch.o
 obj-$(CONFIG_HID_KYE)		+= hid-kye.o
@@ -78,7 +79,6 @@ obj-$(CONFIG_HID_ZYDACRON)	+= hid-zydacron.o
 obj-$(CONFIG_HID_WACOM)		+= hid-wacom.o
 obj-$(CONFIG_HID_WALTOP)	+= hid-waltop.o
 obj-$(CONFIG_HID_WIIMOTE)	+= hid-wiimote.o
-obj-$(CONFIG_HYPERV_MOUSE)	+= hid-hyperv.o
 
 obj-$(CONFIG_USB_HID)		+= usbhid/
 obj-$(CONFIG_USB_MOUSE)		+= usbhid/