Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267971
b: refs/heads/master
c: 18d08af
h: refs/heads/master
i:
  267969: cfc6c9e
  267967: c186f90
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 25, 2011
1 parent 71e9d4f commit 9deaef3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 23 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5585d81e0a52f7994b8cdc6a8927b425c068444a
refs/heads/master: 18d08aff878c827e8a7a0ea10da597a44ddfe7bc
22 changes: 0 additions & 22 deletions trunk/drivers/staging/hv/hv_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
#include <linux/input.h>
#include <linux/hid.h>
#include <linux/hiddev.h>
#include <linux/pci.h>
#include <linux/dmi.h>

#include "hyperv.h"

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 9deaef3

Please sign in to comment.