From 83fee7c6055707f2f2f1a45b76a8f9ce53925090 Mon Sep 17 00:00:00 2001 From: Zhao Yakui Date: Mon, 2 Feb 2009 22:55:01 -0500 Subject: ACPI: proc_dir_entry 'video/VGA' already registered commit f3b39f1393d5cebe56f43a584ef47efbebd2702c upstream. eliminate the duplicate the name of "VGA" http://bugzilla.kernel.org/show_bug.cgi?id=12514 Signed-off-by: Zhao Yakui Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/video.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'drivers') diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index baaff815bbc1..9bf8f86f536d 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1991,6 +1991,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); -- cgit v1.2.3