X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=drivers%2Facpi%2Fvideo.c;h=ac63be4e8197e8c7c30e09e415dc1fc37d925573;hb=e6d9da1de0f31c57cfe3837b1b4e51c6d96fcd3c;hp=d98701941981421837a7c622da0a416eccad8442;hpb=80492cc797ea15572de8eac766cbf606626ee338;p=linux-2.6

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index d987019419..ac63be4e81 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1833,6 +1833,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
 	return;
 }
 
+static int instance;
 static int acpi_video_bus_add(struct acpi_device *device)
 {
 	int result = 0;
@@ -1847,6 +1848,13 @@ static int acpi_video_bus_add(struct acpi_device *device)
 	if (!video)
 		return -ENOMEM;
 
+	/* a hack to fix the duplicate name "VID" problem on T61 */
+	if (!strcmp(device->pnp.bus_id, "VID")) {
+		if (instance)
+			device->pnp.bus_id[3] = '0' + instance;
+		instance ++;
+	}
+
 	video->device = device;
 	strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
 	strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);