diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
| commit | f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 (patch) | |
| tree | 8e05bccd7b85fc3dd2fbd33ec3286de27e152819 /drivers/misc/ibmasm/module.c | |
| parent | 79f3b3cb7a2586b319a43a7f29924c6c555e4357 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into x86/urgent
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; |