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>
This commit is contained in:
parent
66db60eaf1
commit
80e7b19ae1
|
@ -1900,7 +1900,7 @@ config PCI_GODIRECT
|
|||
bool "Direct"
|
||||
|
||||
config PCI_GOOLPC
|
||||
bool "OLPC"
|
||||
bool "OLPC XO-1"
|
||||
depends on OLPC
|
||||
|
||||
config PCI_GOANY
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -304,7 +304,7 @@ static struct pci_raw_ops pci_olpc_conf = {
|
|||
|
||||
int __init pci_olpc_init(void)
|
||||
{
|
||||
printk(KERN_INFO "PCI: Using configuration type OLPC\n");
|
||||
printk(KERN_INFO "PCI: Using configuration type OLPC XO-1\n");
|
||||
raw_pci_ops = &pci_olpc_conf;
|
||||
is_lx = is_geode_lx();
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue