diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:51:15 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:51:15 -0500 |
| commit | 4ab432677957e0a064bba3690004d3244de8ad6c (patch) | |
| tree | 4ef5785f20be6f62bfc7fbe4f124e1751c9cabf5 /drivers/net | |
| parent | 30765528d156e58d41ed07cae8726c9105111b9d (diff) | |
| parent | 624f54be206adf970cd8eece16446b027913e533 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/dgrs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index 2a290cc397ad..70b47e4c4e9c 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c | |||
| @@ -1458,6 +1458,8 @@ static struct pci_driver dgrs_pci_driver = { | |||
| 1458 | .probe = dgrs_pci_probe, | 1458 | .probe = dgrs_pci_probe, |
| 1459 | .remove = __devexit_p(dgrs_pci_remove), | 1459 | .remove = __devexit_p(dgrs_pci_remove), |
| 1460 | }; | 1460 | }; |
| 1461 | #else | ||
| 1462 | static struct pci_driver dgrs_pci_driver = {}; | ||
| 1461 | #endif | 1463 | #endif |
| 1462 | 1464 | ||
| 1463 | 1465 | ||