diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-17 15:27:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-17 15:27:22 -0500 |
| commit | b4aa9e05a61b845541fa6f5b1d246976922601f0 (patch) | |
| tree | ca94478c3df281ab76a3399f5ba6341ade3f5791 /drivers/atm/lanai.c | |
| parent | 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 (diff) | |
| parent | 4b8fe66300acb2fba8b16d62606e0d30204022fc (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c
Diffstat (limited to 'drivers/atm/lanai.c')
| -rw-r--r-- | drivers/atm/lanai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c index 930051d941a7..52880c8387d8 100644 --- a/drivers/atm/lanai.c +++ b/drivers/atm/lanai.c | |||
| @@ -2588,7 +2588,7 @@ static int __devinit lanai_init_one(struct pci_dev *pci, | |||
| 2588 | return -ENOMEM; | 2588 | return -ENOMEM; |
| 2589 | } | 2589 | } |
| 2590 | 2590 | ||
| 2591 | atmdev = atm_dev_register(DEV_LABEL, &ops, -1, NULL); | 2591 | atmdev = atm_dev_register(DEV_LABEL, &pci->dev, &ops, -1, NULL); |
| 2592 | if (atmdev == NULL) { | 2592 | if (atmdev == NULL) { |
| 2593 | printk(KERN_ERR DEV_LABEL | 2593 | printk(KERN_ERR DEV_LABEL |
| 2594 | ": couldn't register atm device!\n"); | 2594 | ": couldn't register atm device!\n"); |