diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-10 20:31:49 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-10 20:31:49 -0500 |
| commit | 84cdda8a1966288de26be5cecf7702d378861ff9 (patch) | |
| tree | 914924b2a78ca756a35c3480d7abb2726f2db1f4 /drivers/net/spider_net.c | |
| parent | 3c50c61826d1e2e9354232f625216c8fcfef48db (diff) | |
| parent | 6e6ece5dc6022e8086c565498d23511bbceda811 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index c796f41b4a52..0d765f1733b5 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -2290,7 +2290,6 @@ spider_net_remove(struct pci_dev *pdev) | |||
| 2290 | } | 2290 | } |
| 2291 | 2291 | ||
| 2292 | static struct pci_driver spider_net_driver = { | 2292 | static struct pci_driver spider_net_driver = { |
| 2293 | .owner = THIS_MODULE, | ||
| 2294 | .name = spider_net_driver_name, | 2293 | .name = spider_net_driver_name, |
| 2295 | .id_table = spider_net_pci_tbl, | 2294 | .id_table = spider_net_pci_tbl, |
| 2296 | .probe = spider_net_probe, | 2295 | .probe = spider_net_probe, |