From e1daa54427f6438c335dd9d411cc0199da5473fc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 2 Mar 2011 20:15:14 -0500 Subject: [PATCH] --- yaml --- r: 236229 b: refs/heads/master c: 76e63665c338069085c4e0ca1b2093dc26258d7a h: refs/heads/master i: 236227: 40747f9b66581211fff7127e703d9daccbcc8d9c v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/Kconfig | 2 +- trunk/drivers/staging/hv/hv_mouse_drv.c | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a80c6672e0bf..bff17b9c7fe7 100644 --- 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 index 2985f0cd2916..d41f380d188f 100644 --- 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 index 09f7d05f1495..760d21f6c195 100644 --- 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);