diff --git a/[refs] b/[refs] index 57865dcd0f4b..5e133dcc4eb1 100644 --- 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 index f261737636da..1981eaf9fa7b 100644 --- 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);