diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-10 10:22:40 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-10 10:22:40 +0400 |
| commit | 5d43889c07bb38694742936aa70d1187c012e198 (patch) | |
| tree | 73809dddae39ae3b746396e9779142dbd1973f33 /drivers/pci/setup-res.c | |
| parent | 95f75e91588afecfb0090988393653d21f5d1f91 (diff) | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
| download | linux-5d43889c07bb38694742936aa70d1187c012e198.tar.xz | |
Merge tag 'v3.13-rc3' into for-linus
Merging with the mainline to sync up on changes to serio core.
Diffstat (limited to 'drivers/pci/setup-res.c')
| -rw-r--r-- | drivers/pci/setup-res.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 07f2eddc09ce..83c4d3bc47ab 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -159,7 +159,7 @@ resource_size_t __weak pcibios_retrieve_fw_addr(struct pci_dev *dev, int idx) return 0; } -static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev, +static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev, int resno, resource_size_t size) { struct resource *root, *conflict; |