---

yaml --- r: 131093 b: refs/heads/master c: f3b39f1 h: refs/heads/master i: 131091: 518f581 v: v3
git-mirror · Feb 3, 2009 · cb0acd5 · cb0acd5
1 parent 18487fd
commit cb0acd5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b190e76def5233c542f6025b4a133b1d4bd1a37
+refs/heads/master: f3b39f1393d5cebe56f43a584ef47efbebd2702c
diff --git a/trunk/drivers/acpi/video.c b/trunk/drivers/acpi/video.c
@@ -2006,6 +2006,12 @@ static int acpi_video_bus_add(struct acpi_device *device)
 			device->pnp.bus_id[3] = '0' + instance;
 		instance ++;
 	}
+	/* a hack to fix the duplicate name "VGA" problem on Pa 3553 */
+	if (!strcmp(device->pnp.bus_id, "VGA")) {
+		if (instance)
+			device->pnp.bus_id[3] = '0' + instance;
+		instance++;
+	}
 
 	video->device = device;
 	strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);