diff options
| author | Daniel Drake <dsd@laptop.org> | 2010-09-23 17:28:04 +0100 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-10-15 13:09:51 -0700 |
| commit | 80e7b19ae167197e84f378809b8ccddd0f99c1fd (patch) | |
| tree | 482b179d2500aa20cc42300d71341d17481e3768 /arch/x86/kernel | |
| parent | 66db60eaf158aa953651d03e43e931e757e87262 (diff) | |
| download | blackbird-obmc-linux-80e7b19ae167197e84f378809b8ccddd0f99c1fd.tar.gz blackbird-obmc-linux-80e7b19ae167197e84f378809b8ccddd0f99c1fd.zip | |
PCI: 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.
Acked-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/kernel')
| -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 |
