提交 80e7b19a 编写于 作者: D Daniel Drake 提交者: Jesse Barnes

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: NAndres Salomon <dilinger@queued.net>
Signed-off-by: NDaniel Drake <dsd@laptop.org>
Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>
上级 66db60ea
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册