projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[deliverable/linux.git]
/
drivers
/
atm
/
firestream.c
diff --git
a/drivers/atm/firestream.c
b/drivers/atm/firestream.c
index 5d86bb803e9493443659f49180b68c147066a166..7d912baf01d444c6adaaa943f87e107ead7441b6 100644
(file)
--- a/
drivers/atm/firestream.c
+++ b/
drivers/atm/firestream.c
@@
-1911,7
+1911,7
@@
static int __devinit firestream_init_one (struct pci_dev *pci_dev,
fs_dev, sizeof (struct fs_dev));
if (!fs_dev)
goto err_out;
- atm_dev = atm_dev_register("fs", &ops, -1, NULL);
+ atm_dev = atm_dev_register("fs", &
pci_dev->dev, &
ops, -1, NULL);
if (!atm_dev)
goto err_out_free_fs_dev;
This page took
0.024035 seconds
and
5
git commands to generate.