Index: trunk/i386/libsaio/nvidia.c
===================================================================
--- trunk/i386/libsaio/nvidia.c	(revision 2358)
+++ trunk/i386/libsaio/nvidia.c	(revision 2359)
@@ -77,6 +77,7 @@
 #define WRITE_LE_SHORT(data)       (((data) << 8 & 0xff00) | ((data) >> 8 & 0x00ff ))
 #define WRITE_LE_INT(data)         (WRITE_LE_SHORT(data) << 16 | WRITE_LE_SHORT(data >> 16))
 
+static bool     showGeneric         = false;
 char generic_name[128];
 extern uint32_t devices_number;
 
@@ -1649,10 +1650,22 @@
 		}
 	}
 
+	//ErmaC added selector for Chameleon "old" style in System Profiler
+	if (getBoolForKey(kNvidiaGeneric, &showGeneric, &bootInfo->chameleonConfig)) {
+		verbose("\tNvidiaGeneric = Yes\n");
+
+		for (i = 1; i < (sizeof(nvidia_card_generic) / sizeof(nvidia_card_generic[0])); i++) {
+			if (nvidia_card_generic[i].device == device_id) {
+				return nvidia_card_generic[i].name;
+			}
+		}
+	return nvidia_card_generic[0].name;
+	}
+
 	// Then check the exceptions table
 	if (subsys_id) {
 		for (i = 0; i < (sizeof(nvidia_card_exceptions) / sizeof(nvidia_card_exceptions[0])); i++) {
-			if ((nvidia_card_exceptions[i].device == device_id) && (nvidia_card_exceptions[i].subdev == subsys_id)) {
+			if ((nvidia_card_exceptions[i].device == device_id) && (nvidia_card_exceptions[i].subdev == subsys_id))	{
 				return nvidia_card_exceptions[i].name;
 				break;
 			}
@@ -1661,7 +1674,7 @@
 
 	// At last try the generic names
 	for (i = 1; i < (sizeof(nvidia_card_generic) / sizeof(nvidia_card_generic[0])); i++) {
-        	if (nvidia_card_generic[i].device == device_id) {
+       	if (nvidia_card_generic[i].device == device_id) {
 			if (subsys_id) {
 				for (j = 0; j < (sizeof(nvidia_card_vendors) / sizeof(nvidia_card_vendors[0])); j++) {
 					if (nvidia_card_vendors[j].device == (subsys_id & 0xffff0000)) {
Index: trunk/package/OptionalSettings/Video.txt
===================================================================
--- trunk/package/OptionalSettings/Video.txt	(revision 2358)
+++ trunk/package/OptionalSettings/Video.txt	(revision 2359)
@@ -34,3 +34,4 @@
 Bool@SkipAtiGfx:SkipAtiGfx=Yes
 Bool@EnableBacklight:EnableBacklight=Yes
 Bool@EnableDualLink:EnableDualLink=Yes
+Bool@NvidiaGeneric:NvidiaGeneric=Yes
Index: trunk/package/OptionalSettings/General.txt
===================================================================
--- trunk/package/OptionalSettings/General.txt	(revision 2358)
+++ trunk/package/OptionalSettings/General.txt	(revision 2359)
@@ -37,3 +37,4 @@
 Bool@UseMemDetect:UseMemDetect=No
 Bool@UseKernelCache:UseKernelCache=Yes
 Bool@Wake:Wake=Yes
+Bool@PrivateData:PrivateData=No
Index: trunk/doc/BootHelp.txt
===================================================================
--- trunk/doc/BootHelp.txt	(revision 2358)
+++ trunk/doc/BootHelp.txt	(revision 2359)
@@ -88,22 +88,24 @@
     SkipNvidiaGfx=Yes|No    Skip the Automatic device-properties generation for Nvidia cards.
     SkipAtiGfx=Yes|No       Skip the Automatic device-properties generation for Ati cards.
 
+    NvidiaGeneric =Yes|No   Use the classic Nvidia name for the SystemProfiler (disabled by default).
+
     AtiConfig=<cardcfg>   Use a different card config, e.g. AtiConfig=Megalodon.
     AtiPorts=<value>      Specify the number of ports, e.g. AtiPorts=2.
-  UseAtiROM=Yes|No      Use an alternate Ati ROM image
+    UseAtiROM=Yes|No      Use an alternate Ati ROM image
                             (default path: /Extra/<vendorid>_<devid>_<subsysid>.rom)
-  UseNvidiaROM=Yes|No   Use an alternate Nvidia ROM image
+    UseNvidiaROM=Yes|No   Use an alternate Nvidia ROM image
                             (default path:  /Extra/<vendorid>_<devid>.rom)
-  VBIOS=Yes|No            Inject VBIOS to device-properties.
+    VBIOS=Yes|No            Inject VBIOS to device-properties.
     display_0=<value>     Inject alternate value of display-cfg into NVDA,Display-A@0 (HEX).
     display_1=<value>     Inject alternate value of display-cfg into NVDA,Display-B@1 (HEX).
     IntelCapriFB=<value>       For Intel HD 4xxx, range 0-11.
     IntelAzulFB=<value>        For Intel HD 5xxx/IRIS, range 0-15.
     InjectIntel-ig=<value>     Inject alternate value into AAPL,ig-platform-id (HEX).
 
-  EnableBacklight=Yes	  Enable Back light option for NVIDIA and ATI
-  EnableDualLink=Yes	  Enable DualLink option for NVIDIA and ATI
-  EnableHDMIAudio=Yes	  Inject HDMI audio for NVIDIA and ATI.
+    EnableBacklight=Yes	  Enable Back light option for NVIDIA and ATI
+    EnableDualLink=Yes	  Enable DualLink option for NVIDIA and ATI
+    EnableHDMIAudio=Yes	  Inject HDMI audio for NVIDIA and ATI.
 
   EthernetBuiltIn=Yes|No  Automatic "built-in"=YES device-properties generation
                           for ethernet interfaces.
@@ -135,6 +137,8 @@
   EnableC3State=Yes       Enable specific Processor power state, C3.
   EnableC4State=Yes       Enable specific Processor power state, C4.
 
+  PrivateData=No          Show masked data (serial number) in bdmesg log (enbaled by default).
+
   ForceFullMemInfo=Yes    Force SMBIOS Table 17 to be 27 bytes long (disabled by default).
 
   SMBIOS=<file>             Use an alternate SMBIOS.plist file