diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-19 00:05:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-19 00:05:22 +0200 |
| commit | 2044f2282d7558c765270d78e19dbdcf6190ca71 (patch) | |
| tree | 03b2c4d211fa8e7e2ef8c489d28a16442f030d57 /arch | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | PCI: fall back to original BIOS BAR addresses (diff) | |
| download | linux-2044f2282d7558c765270d78e19dbdcf6190ca71.tar.xz linux-2044f2282d7558c765270d78e19dbdcf6190ca71.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: fall back to original BIOS BAR addresses
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/pci/i386.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 6fdb3ec30c31..55253095be84 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -184,6 +184,7 @@ static void __init pcibios_allocate_resources(int pass) idx, r, disabled, pass); if (pci_claim_resource(dev, idx) < 0) { /* We'll assign a new address later */ + dev->fw_addr[idx] = r->start; r->end -= r->start; r->start = 0; } |