diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /arch/x86/pci/legacy.c | |
| parent | 671eef85a3e885dff4ce210d8774ad50a91d5967 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'arch/x86/pci/legacy.c')
| -rw-r--r-- | arch/x86/pci/legacy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index ec9ce35e44d6..b722dd481b39 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c | |||
| @@ -14,7 +14,7 @@ static void __devinit pcibios_fixup_peer_bridges(void) | |||
| 14 | int n, devfn; | 14 | int n, devfn; |
| 15 | long node; | 15 | long node; |
| 16 | 16 | ||
| 17 | if (pcibios_last_bus <= 0 || pcibios_last_bus >= 0xff) | 17 | if (pcibios_last_bus <= 0 || pcibios_last_bus > 0xff) |
| 18 | return; | 18 | return; |
| 19 | DBG("PCI: Peer bridge fixup\n"); | 19 | DBG("PCI: Peer bridge fixup\n"); |
| 20 | 20 | ||