diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/misc/ibmasm/module.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/misc/ibmasm/module.c')
| -rw-r--r-- | drivers/misc/ibmasm/module.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c index b5f6add34b0b..dc14b0b9cbfa 100644 --- a/drivers/misc/ibmasm/module.c +++ b/drivers/misc/ibmasm/module.c | |||
| @@ -104,8 +104,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi | |||
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | sp->irq = pdev->irq; | 106 | sp->irq = pdev->irq; |
| 107 | sp->base_address = ioremap(pci_resource_start(pdev, 0), | 107 | sp->base_address = pci_ioremap_bar(pdev, 0); |
| 108 | pci_resource_len(pdev, 0)); | ||
| 109 | if (!sp->base_address) { | 108 | if (!sp->base_address) { |
| 110 | dev_err(sp->dev, "Failed to ioremap pci memory\n"); | 109 | dev_err(sp->dev, "Failed to ioremap pci memory\n"); |
| 111 | result = -ENODEV; | 110 | result = -ENODEV; |