diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:04:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:04:37 -0400 |
| commit | 3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 (patch) | |
| tree | 9449490978cdb7858a7c713ee88f15ffc26a6d71 /drivers/net/tokenring/abyss.c | |
| parent | 5be1d85c208f135fc88f972f91b91a879b702b40 (diff) | |
| parent | e13934563db047043ccead26412f552375cea90c (diff) | |
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/tokenring/abyss.c')
| -rw-r--r-- | drivers/net/tokenring/abyss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c index 87103c400999..9345e68c451e 100644 --- a/drivers/net/tokenring/abyss.c +++ b/drivers/net/tokenring/abyss.c | |||
| @@ -139,7 +139,7 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_ | |||
| 139 | */ | 139 | */ |
| 140 | dev->base_addr += 0x10; | 140 | dev->base_addr += 0x10; |
| 141 | 141 | ||
| 142 | ret = tmsdev_init(dev, PCI_MAX_ADDRESS, pdev); | 142 | ret = tmsdev_init(dev, &pdev->dev); |
| 143 | if (ret) { | 143 | if (ret) { |
| 144 | printk("%s: unable to get memory for dev->priv.\n", | 144 | printk("%s: unable to get memory for dev->priv.\n", |
| 145 | dev->name); | 145 | dev->name); |