diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 09:50:33 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 09:50:33 +0100 |
| commit | 2226340eb8df9c42f9fca74582d08d5117fc0cec (patch) | |
| tree | c98370844715194600b79f886dbc391633f3e470 /drivers/net | |
| parent | [bonding] Remove superfluous changelog. (diff) | |
| parent | Linux v2.6.15-rc3 (diff) | |
| download | linux-2226340eb8df9c42f9fca74582d08d5117fc0cec.tar.xz linux-2226340eb8df9c42f9fca74582d08d5117fc0cec.zip | |
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 = { .probe = dgrs_pci_probe, .remove = __devexit_p(dgrs_pci_remove), }; +#else +static struct pci_driver dgrs_pci_driver = {}; #endif |