diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 11:33:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 11:33:08 -0700 |
commit | 256a13dd708004082a2de0938fd614b155c259e2 (patch) | |
tree | 5e917c649b9ea7792a18cdf8a25736bc62b870e9 /arch/x86/pci/init.c | |
parent | 330bcd2f7bd1e2e66d54bf95adca0795b262469f (diff) | |
parent | 9f67fd5db50566728996b0115a08c83d4f902cb3 (diff) |
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:
x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC
Diffstat (limited to 'arch/x86/pci/init.c')
-rw-r--r-- | arch/x86/pci/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c index e70b9c57b88..b821f4462d9 100644 --- a/arch/x86/pci/init.c +++ b/arch/x86/pci/init.c @@ -15,7 +15,8 @@ static __init int pci_access_init(void) pci_mmcfg_early_init(); #ifdef CONFIG_PCI_OLPC - pci_olpc_init(); + if (!pci_olpc_init()) + return 0; /* skip additional checks if it's an XO */ #endif #ifdef CONFIG_PCI_BIOS pci_pcbios_init(); |