diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:50:22 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:50:22 -0500 |
| commit | f85272a97825d4a67098a8ad70fa5efb55e4847a (patch) | |
| tree | e55b38e21b45213269057417032db4440e8f5eed /drivers/char/watchdog/pcwd_pci.c | |
| parent | 1c72d8d90da3b29540c3c281a3e0b743ee6b6f74 (diff) | |
| parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/watchdog/pcwd_pci.c')
| -rw-r--r-- | drivers/char/watchdog/pcwd_pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/char/watchdog/pcwd_pci.c index d9ef55bdf88a..2451edbefece 100644 --- a/drivers/char/watchdog/pcwd_pci.c +++ b/drivers/char/watchdog/pcwd_pci.c | |||
| @@ -755,7 +755,6 @@ static struct pci_device_id pcipcwd_pci_tbl[] = { | |||
| 755 | MODULE_DEVICE_TABLE(pci, pcipcwd_pci_tbl); | 755 | MODULE_DEVICE_TABLE(pci, pcipcwd_pci_tbl); |
| 756 | 756 | ||
| 757 | static struct pci_driver pcipcwd_driver = { | 757 | static struct pci_driver pcipcwd_driver = { |
| 758 | .owner = THIS_MODULE, | ||
| 759 | .name = WATCHDOG_NAME, | 758 | .name = WATCHDOG_NAME, |
| 760 | .id_table = pcipcwd_pci_tbl, | 759 | .id_table = pcipcwd_pci_tbl, |
| 761 | .probe = pcipcwd_card_init, | 760 | .probe = pcipcwd_card_init, |