summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-03-02 20:15:14 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-02 20:15:14 -0500
commit76e63665c338069085c4e0ca1b2093dc26258d7a (patch)
treeff6cee6a8799cbaa2d1c641f9c4bb62909d31354
parent9cceab99d7038b69093fd0142f644224c040a6bb (diff)
downloadop-kernel-dev-76e63665c338069085c4e0ca1b2093dc26258d7a.zip
op-kernel-dev-76e63665c338069085c4e0ca1b2093dc26258d7a.tar.gz
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 <hjanssen@microsoft.com> Cc: K. Y. Srinivasan <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/hv/Kconfig2
-rw-r--r--drivers/staging/hv/hv_mouse_drv.c8
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);
OpenPOWER on IntegriCloud