From 3b6d5a38e1781bd3cceea3b565a15db063ae48c9 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Thu, 23 Sep 2010 17:28:04 +0100
Subject: [PATCH] --- yaml --- r: 219549 b: refs/heads/master c:
 80e7b19ae167197e84f378809b8ccddd0f99c1fd h: refs/heads/master i:   219547:
 07b206e23d476b770cc97eaa03619b9383baa77f v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/Kconfig       | 2 +-
 trunk/arch/x86/kernel/olpc.c | 6 ++++--
 trunk/arch/x86/pci/olpc.c    | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3da56cf2b158..8089de8d6ba5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66db60eaf158aa953651d03e43e931e757e87262
+refs/heads/master: 80e7b19ae167197e84f378809b8ccddd0f99c1fd
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index cea0cd9a316f..0ed4c9bfcd13 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -1900,7 +1900,7 @@ config PCI_GODIRECT
 	bool "Direct"
 
 config PCI_GOOLPC
-	bool "OLPC"
+	bool "OLPC XO-1"
 	depends on OLPC
 
 config PCI_GOANY
diff --git a/trunk/arch/x86/kernel/olpc.c b/trunk/arch/x86/kernel/olpc.c
index 0e0cdde519be..635888cf050d 100644
--- a/trunk/arch/x86/kernel/olpc.c
+++ b/trunk/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
 
diff --git a/trunk/arch/x86/pci/olpc.c b/trunk/arch/x86/pci/olpc.c
index b34815408f58..13700ec8e2e4 100644
--- a/trunk/arch/x86/pci/olpc.c
+++ b/trunk/arch/x86/pci/olpc.c
@@ -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;