[PATCH 645/961] Staging: hv: enable mouse driver to build

Greg Kroah-Hartman gregkh at suse.de
Wed Mar 16 21:04:48 UTC 2011


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 <hjanssen at microsoft.com>
Cc: K. Y. Srinivasan <kys at microsoft.com>
Cc: Haiyang Zhang <haiyangz at microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/staging/hv/Kconfig        |    2 +-
 drivers/staging/hv/hv_mouse_drv.c |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig
index 2985f0c..d41f380 100644
--- 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 09f7d05..760d21f 100644
--- a/drivers/staging/hv/hv_mouse_drv.c
+++ b/drivers/staging/hv/hv_mouse_drv.c
@@ -317,6 +317,13 @@ static void __exit mousevsc_exit(void)
 }
 
 /*
+ * 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
  * installed and/or configured.  We don't do anything else with the table, but
@@ -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);
-- 
1.7.4.1




More information about the devel mailing list