From 9deaef3f4fb81232a3c2c3f327b86bd110514a3a Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 25 Aug 2011 09:49:23 -0700 Subject: [PATCH] --- yaml --- r: 267971 b: refs/heads/master c: 18d08aff878c827e8a7a0ea10da597a44ddfe7bc h: refs/heads/master i: 267969: cfc6c9e41a362b19174ab4ee39573dea2673bebd 267967: c186f90e9fb752d90d035da655b18da4c4ce2138 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/hv_mouse.c | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/[refs] b/[refs] index 0d15dddca48d..9a150d01ba74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5585d81e0a52f7994b8cdc6a8927b425c068444a +refs/heads/master: 18d08aff878c827e8a7a0ea10da597a44ddfe7bc diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c index 07a65842bb28..dfa8ae87ca65 100644 --- a/trunk/drivers/staging/hv/hv_mouse.c +++ b/trunk/drivers/staging/hv/hv_mouse.c @@ -22,8 +22,6 @@ #include #include #include -#include -#include #include "hyperv.h" @@ -935,26 +933,6 @@ static void __exit mousevsc_exit(void) vmbus_driver_unregister(&mousevsc_drv); } -/* - * 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 - * it needs to be present. - */ -static const struct pci_device_id microsoft_hv_pci_table[] = { - { PCI_DEVICE(0x1414, 0x5353) }, /* VGA compatible controller */ - { 0 } -}; -MODULE_DEVICE_TABLE(pci, microsoft_hv_pci_table); -#endif - MODULE_LICENSE("GPL"); MODULE_VERSION(HV_DRV_VERSION); module_init(mousevsc_init);