aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-11-22 16:52:15 -0500
committerJiri Kosina <jkosina@suse.cz>2011-11-22 16:52:15 -0500
commit6cf851d803a17aa43edc23f9ec57378c041fddfb (patch)
tree05413c7100dd213a16a87f6e27159ffacbbdb983
parentb95f5bcb811e3905b5376f87789da8d097fee682 (diff)
HID: hyperv: fixup Kconfig / Makefile entries
Rename the Kconfig entry for hyperv mouse driver so that it has HID_ prefix as all the other drivers; while at it, place the entry for this driver to properly ordered place in Makefile and Kconfig. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/Kconfig12
-rw-r--r--drivers/hid/Makefile2
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 387bb532e135..f5aa4a0bbffb 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -560,6 +560,12 @@ config GREENASIA_FF
560 (like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter 560 (like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter
561 and want to enable force feedback support for it. 561 and want to enable force feedback support for it.
562 562
563config HID_HYPERV_MOUSE
564 tristate "Microsoft Hyper-V mouse driver"
565 depends on HYPERV
566 ---help---
567 Select this option to enable the Hyper-V mouse driver.
568
563config HID_SMARTJOYPLUS 569config HID_SMARTJOYPLUS
564 tristate "SmartJoy PLUS PS2/USB adapter support" 570 tristate "SmartJoy PLUS PS2/USB adapter support"
565 depends on USB_HID 571 depends on USB_HID
@@ -643,12 +649,6 @@ config HID_ZYDACRON
643 ---help--- 649 ---help---
644 Support for Zydacron remote control. 650 Support for Zydacron remote control.
645 651
646config HYPERV_MOUSE
647 tristate "Microsoft Hyper-V mouse driver"
648 depends on HYPERV
649 ---help---
650 Select this option to enable the Hyper-V mouse driver.
651
652endmenu 652endmenu
653 653
654endif # HID_SUPPORT 654endif # HID_SUPPORT
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index fbb1ee6ff2ff..eed64f4214a2 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -38,6 +38,7 @@ obj-$(CONFIG_HID_ELECOM) += hid-elecom.o
38obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o 38obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o
39obj-$(CONFIG_HID_GYRATION) += hid-gyration.o 39obj-$(CONFIG_HID_GYRATION) += hid-gyration.o
40obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o 40obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o
41obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o
41obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o 42obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o
42obj-$(CONFIG_HID_KEYTOUCH) += hid-keytouch.o 43obj-$(CONFIG_HID_KEYTOUCH) += hid-keytouch.o
43obj-$(CONFIG_HID_KYE) += hid-kye.o 44obj-$(CONFIG_HID_KYE) += hid-kye.o
@@ -78,7 +79,6 @@ obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o
78obj-$(CONFIG_HID_WACOM) += hid-wacom.o 79obj-$(CONFIG_HID_WACOM) += hid-wacom.o
79obj-$(CONFIG_HID_WALTOP) += hid-waltop.o 80obj-$(CONFIG_HID_WALTOP) += hid-waltop.o
80obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o 81obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o
81obj-$(CONFIG_HYPERV_MOUSE) += hid-hyperv.o
82 82
83obj-$(CONFIG_USB_HID) += usbhid/ 83obj-$(CONFIG_USB_HID) += usbhid/
84obj-$(CONFIG_USB_MOUSE) += usbhid/ 84obj-$(CONFIG_USB_MOUSE) += usbhid/