Index: branches/azimutz/CleanCut/i386/libsaio/pci_root.c
===================================================================
--- branches/azimutz/CleanCut/i386/libsaio/pci_root.c	(revision 335)
+++ branches/azimutz/CleanCut/i386/libsaio/pci_root.c	(revision 336)
@@ -58,20 +58,6 @@
 		if (isdigit(val[0])) rootuid = val[0] - '0';
 		goto out;
 	}
-	/* Chameleon compatibility */
-	else if (getValueForKey("PciRoot", &val, &len, &bootInfo->bootConfig)) {
-		if (isdigit(val[0])) rootuid = val[0] - '0';
-		goto out;
-	}
-	/* PCEFI compatibility */
-	else if (getValueForKey("-pci0", &val, &len, &bootInfo->bootConfig)) {
-		rootuid = 0;
-		goto out;
-	}
-	else if (getValueForKey("-pci1", &val, &len, &bootInfo->bootConfig)) {
-		rootuid = 1;
-		goto out;
-	}
 
 	int fd = search_and_get_acpi_fd("DSDT.aml", &dsdt_filename);
 
Index: branches/azimutz/CleanCut/i386/boot2/boot.h
===================================================================
--- branches/azimutz/CleanCut/i386/boot2/boot.h	(revision 335)
+++ branches/azimutz/CleanCut/i386/boot2/boot.h	(revision 336)
@@ -83,7 +83,7 @@
 #define kSystemType			"SystemType"		// fake_efi.c
 #define kUseNvidiaROM		"UseNvidiaROM"		// nvidia.c
 #define kVBIOS				"VBIOS"				// nvidia.c
-#define kPCIRootUID			"PCIRootUID"		// pci_root.c
+#define kPCIRootUID			"PciRoot"			// pci_root.c
 #define kEthernetBuiltIn	"EthernetBuiltIn"	// pci_setup.c
 #define kGraphicsEnabler	"GraphicsEnabler"	// pci_setup.c
 #define kForceHPET			"ForceHPET"			// pci_setup.c