git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-next
[pandora-kernel.git]
/
drivers
/
atm
/
iphase.c
diff --git
a/drivers/atm/iphase.c
b/drivers/atm/iphase.c
index
ad8e207
..
d80d51b
100644
(file)
--- a/
drivers/atm/iphase.c
+++ b/
drivers/atm/iphase.c
@@
-3172,7
+3172,7
@@
static int __devinit ia_init_one(struct pci_dev *pdev,
ret = -ENODEV;
goto err_out_free_iadev;
}
- dev = atm_dev_register(DEV_LABEL, &ops, -1, NULL);
+ dev = atm_dev_register(DEV_LABEL, &
pdev->dev, &
ops, -1, NULL);
if (!dev) {
ret = -ENOMEM;
goto err_out_disable_dev;