diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-11-22 16:52:15 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-22 16:52:15 -0500 |
commit | 6cf851d803a17aa43edc23f9ec57378c041fddfb (patch) | |
tree | 05413c7100dd213a16a87f6e27159ffacbbdb983 | |
parent | b95f5bcb811e3905b5376f87789da8d097fee682 (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/Kconfig | 12 | ||||
-rw-r--r-- | drivers/hid/Makefile | 2 |
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 | ||
563 | config 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 | |||
563 | config HID_SMARTJOYPLUS | 569 | config 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 | ||
646 | config 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 | |||
652 | endmenu | 652 | endmenu |
653 | 653 | ||
654 | endif # HID_SUPPORT | 654 | endif # 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 | |||
38 | obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o | 38 | obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o |
39 | obj-$(CONFIG_HID_GYRATION) += hid-gyration.o | 39 | obj-$(CONFIG_HID_GYRATION) += hid-gyration.o |
40 | obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o | 40 | obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o |
41 | obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o | ||
41 | obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o | 42 | obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o |
42 | obj-$(CONFIG_HID_KEYTOUCH) += hid-keytouch.o | 43 | obj-$(CONFIG_HID_KEYTOUCH) += hid-keytouch.o |
43 | obj-$(CONFIG_HID_KYE) += hid-kye.o | 44 | obj-$(CONFIG_HID_KYE) += hid-kye.o |
@@ -78,7 +79,6 @@ obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o | |||
78 | obj-$(CONFIG_HID_WACOM) += hid-wacom.o | 79 | obj-$(CONFIG_HID_WACOM) += hid-wacom.o |
79 | obj-$(CONFIG_HID_WALTOP) += hid-waltop.o | 80 | obj-$(CONFIG_HID_WALTOP) += hid-waltop.o |
80 | obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o | 81 | obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o |
81 | obj-$(CONFIG_HYPERV_MOUSE) += hid-hyperv.o | ||
82 | 82 | ||
83 | obj-$(CONFIG_USB_HID) += usbhid/ | 83 | obj-$(CONFIG_USB_HID) += usbhid/ |
84 | obj-$(CONFIG_USB_MOUSE) += usbhid/ | 84 | obj-$(CONFIG_USB_MOUSE) += usbhid/ |