diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 22:46:24 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 22:46:24 +0000 |
| commit | 25cf0398bdf365d027e171116aa4a281e9cd3c1c (patch) | |
| tree | a8be3d3d314625a376be0e62c67809dc22274dd4 /drivers/atm/horizon.c | |
| parent | 9326845f45650f6af9953a4b6a31e89b54fab82f (diff) | |
| parent | 59bdd133561a432c4655146e283caf85fa64c2fb (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'drivers/atm/horizon.c')
| -rw-r--r-- | drivers/atm/horizon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index a95790452a68..24761e1d6642 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c @@ -2733,7 +2733,8 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_ PRINTD(DBG_INFO, "found Madge ATM adapter (hrz) at: IO %x, IRQ %u, MEM %p", iobase, irq, membase); - dev->atm_dev = atm_dev_register(DEV_LABEL, &hrz_ops, -1, NULL); + dev->atm_dev = atm_dev_register(DEV_LABEL, &pci_dev->dev, &hrz_ops, -1, + NULL); if (!(dev->atm_dev)) { PRINTD(DBG_ERR, "failed to register Madge ATM adapter"); err = -EINVAL; |