Staging: hv: enable mouse driver to build

But we disable it from automatically loading as that would
be bad.  This way people can build it easier and start cleaning
it up, as it needs it.

Cc: Hank Janssen <[email protected]>
Cc: K. Y. Srinivasan <[email protected]>
Cc: Haiyang Zhang <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig
index 2985f0cd29160cd5593e4079231bf9dd24c79e01..d41f380d188f985fbea159555a94702cb7a226f4 100644 (file)
--- a/drivers/staging/hv/Kconfig
+++ b/drivers/staging/hv/Kconfig
@@ -38,7 +38,7 @@ config HYPERV_UTILS
 
 config HYPERV_MOUSE
        tristate "Microsoft Hyper-V mouse driver"
-       depends on HID && BROKEN
+       depends on HID
        default HYPERV
        help
          Select this option to enable the Hyper-V mouse driver.

diff --git a/drivers/staging/hv/hv_mouse_drv.c b/drivers/staging/hv/hv_mouse_drv.c
index 09f7d05f1495cd69b968dd9940e729513c2f7f0f..760d21f6c1953c2274f84e7710bf8d9e5a7ee3f7 100644 (file)
--- a/drivers/staging/hv/hv_mouse_drv.c
+++ b/drivers/staging/hv/hv_mouse_drv.c
@@ -316,6 +316,13 @@ static void __exit mousevsc_exit(void)
        mousevsc_drv_exit();
 }
 
+/*
+ * We don't want to automatically load this driver just yet, it's quite
+ * broken.  It's safe if you want to load it yourself manually, but
+ * don't inflict it on unsuspecting users, that's just mean.
+ */
+#if 0
+
 /*
  * We use a PCI table to determine if we should autoload this driver  This is
  * needed by distro tools to determine if the hyperv drivers should be
@@ -327,6 +334,7 @@ const static struct pci_device_id microsoft_hv_pci_table[] = {
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, microsoft_hv_pci_table);
+#endif
 
 MODULE_LICENSE("GPL");
 MODULE_VERSION(HV_DRV_VERSION);