Messages in this thread Patch in this message | | | From | jwjstone@fastmail ... | Subject | [PATCH] acpi: Fix the build when the video output switcher is disabled | Date | Thu, 28 Oct 2010 20:06:18 +0100 |
| |
From: Jack Stone <jwjstone@fastmail.fm>
When CONFIG_ACPI_VIDEO is enabled and CONFIG_VIDEO_OUTPUT_CONTROL is disabled the following errors occur:
drivers/built-in.o: In function `acpi_video_bus_put_one_device': /home/jwjs/projects/linux.trees.git/drivers/acpi/video.c:1455: undefined reference to `video_output_unregister' drivers/built-in.o: In function `acpi_video_device_find_cap': /home/jwjs/projects/linux.trees.git/drivers/acpi/video.c:917: undefined reference to `video_output_register'
Fix this by adding ifdefs around the offending calls in acpi video.
Signed-off-by: Jack Stone <jwjstone@fastmail.fm> --- drivers/acpi/video.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 5cd0228..a3ec29e 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -905,6 +905,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) } +#ifdef CONFIG_VIDEO_OUTPUT_CONTROL if (acpi_video_display_switch_support()) { if (device->cap._DCS && device->cap._DSS) { @@ -919,6 +920,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) kfree(name); } } +#endif } /* @@ -1452,7 +1454,9 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device) thermal_cooling_device_unregister(device->cooling_dev); device->cooling_dev = NULL; } +#ifdef CONFIG_VIDEO_OUTPUT_CONTROL video_output_unregister(device->output_dev); +#endif return 0; } -- 1.7.3.2.145.g7ebee
| |