From 8a66074c379cacc79168681bf7dea37ad278f5d1 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 17 Sep 2007 22:54:34 +0200 Subject: [PATCH 1/3] sony-laptop/thinkpad-acpi: fix INPUT=n build Build errors if CONFIG_SONY_LAPTOP && !INPUT or if CONFIG_THINKPAD_ACPI && !INPUT: LD vmlinux ... drivers/built-in.o: In function `sony_laptop_remove_input': sony-laptop.c:(.text+0x768fb): undefined reference to `input_unregister_device' ... drivers/built-in.o: In function `thinkpad_acpi_module_exit': thinkpad_acpi.c:(.text+0x78c1b): undefined reference to `input_free_device' ... Signed-off-by: Andreas Herrmann Acked-by: Henrique de Moraes Holschuh Acked-by: Mattia Dongili Signed-off-by: Len Brown --- drivers/misc/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 73e248fb2ff1..7b580c3152de 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -134,6 +134,7 @@ config SONY_LAPTOP tristate "Sony Laptop Extras" depends on X86 && ACPI select BACKLIGHT_CLASS_DEVICE + depends on INPUT ---help--- This mini-driver drives the SNC and SPIC devices present in the ACPI BIOS of the Sony Vaio laptops. @@ -156,6 +157,7 @@ config THINKPAD_ACPI select BACKLIGHT_CLASS_DEVICE select HWMON select NVRAM + depends on INPUT ---help--- This is a driver for the IBM and Lenovo ThinkPad laptops. It adds support for Fn-Fx key combinations, Bluetooth control, video From 03e2bf261e832abf48d40113ce08a70338dd18c9 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 17 Sep 2007 23:41:05 +0200 Subject: [PATCH 2/3] acpi_video: kernel build error if !INPUT Commit e9dab1960ac9746fa34eff726b81635147615a79 (ACPI video hotkey: export missing ACPI video hotkey events via input layer) exports ACPI video hotkey events via input layer. But this breaks kernel build if ACPI_VIDEO && !INPUT: LD .tmp_vmlinux1 drivers/built-in.o: In function `acpi_video_bus_remove': drivers/acpi/video.c:2007: undefined reference to `input_unregister_device' ... Signed-off-by: Andreas Herrmann Signed-off-by: Len Brown --- drivers/acpi/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 4875f0149eb4..9685b75898ed 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -117,6 +117,7 @@ config ACPI_BUTTON config ACPI_VIDEO tristate "Video" depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL + depends on INPUT help This driver implement the ACPI Extensions For Display Adapters for integrated graphics devices on motherboard, as specified in From 8ab7367f483d1d676d61fca58498a73b194dda82 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 2 Oct 2007 13:24:10 -0700 Subject: [PATCH 3/3] ACPI: suppress uninitialized var warning drivers/acpi/tables/tbutils.c: In function `acpi_tb_parse_root_table': drivers/acpi/tables/tbutils.c:403: warning: `rsdt_address' may be used uninitialized in this function Reported-by: Uwe Bugla Signed-off-by: Andrew Morton Signed-off-by: Len Brown --- drivers/acpi/tables/tbutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c index 8cc9492ffbf2..5f1d85f2ffe4 100644 --- a/drivers/acpi/tables/tbutils.c +++ b/drivers/acpi/tables/tbutils.c @@ -400,7 +400,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags) u32 table_count; struct acpi_table_header *table; acpi_physical_address address; - acpi_physical_address rsdt_address; + acpi_physical_address uninitialized_var(rsdt_address); u32 length; u8 *table_entry; acpi_status status;