diff options
| author | Daniel Drake <dsd@laptop.org> | 2010-09-23 17:28:04 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-09-23 11:14:18 -0700 |
| commit | 76fb657017588a0912f0d1d140cb807446e4ef05 (patch) | |
| tree | 7bd59420c34c78a7581e8bdbfb870fdb3e47eb50 /arch/x86/kernel/olpc.c | |
| parent | b30a3f6257ed2105259b404d419b4964e363928c (diff) | |
| download | linux-76fb657017588a0912f0d1d140cb807446e4ef05.tar.bz2 | |
x86, olpc: Only enable PCI configuration type override on XO-1
This configuration type override is for XO-1 only and must not happen
on XO-1.5.
Signed-off-by: Daniel Drake <dsd@laptop.org>
LKML-Reference: <20100923162805.0F6549D401B@zog.reactivated.net>
Cc: Andres Solomon <dilinger@queued.net>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/olpc.c')
| -rw-r--r-- | arch/x86/kernel/olpc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c index 0e0cdde519be..635888cf050d 100644 --- a/arch/x86/kernel/olpc.c +++ b/arch/x86/kernel/olpc.c @@ -242,8 +242,10 @@ static int __init olpc_init(void) (unsigned char *) &olpc_platform_info.ecver, 1); #ifdef CONFIG_PCI_OLPC - /* If the VSA exists let it emulate PCI, if not emulate in kernel */ - if (!cs5535_has_vsa2()) + /* If the VSA exists let it emulate PCI, if not emulate in kernel. + * XO-1 only. */ + if (olpc_platform_info.boardrev < olpc_board_pre(0xd0) && + !cs5535_has_vsa2()) x86_init.pci.arch_init = pci_olpc_init; #endif |