---

yaml --- r: 236229 b: refs/heads/master c: 76e6366 h: refs/heads/master i: 236227: 40747f9 v: v3
git-mirror · Mar 3, 2011 · e1daa54 · e1daa54
1 parent 3cfb470
commit e1daa54
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cceab99d7038b69093fd0142f644224c040a6bb
+refs/heads/master: 76e63665c338069085c4e0ca1b2093dc26258d7a
diff --git a/trunk/drivers/staging/hv/Kconfig b/trunk/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/trunk/drivers/staging/hv/hv_mouse_drv.c b/trunk/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);