From f5527c2c48a00d18561a9a3877e7207e7d7ac953 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Tue, 2 Oct 2007 13:24:08 -0700 Subject: [PATCH] --- yaml --- r: 71605 b: refs/heads/master c: 8a0bb7362587807fec985f72fb0317aa8ed24835 h: refs/heads/master i: 71603: dec4069775164e21f7e109aa13abec1477be26c0 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/Kconfig | 1 - trunk/drivers/acpi/sleep/main.c | 5 +++++ trunk/drivers/acpi/tables/tbutils.c | 2 +- trunk/drivers/misc/Kconfig | 2 -- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6820461556f9..94f331cfff4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67e74fdd81349a92fcece318a5ee41714273eb01 +refs/heads/master: 8a0bb7362587807fec985f72fb0317aa8ed24835 diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig index 9685b75898ed..4875f0149eb4 100644 --- a/trunk/drivers/acpi/Kconfig +++ b/trunk/drivers/acpi/Kconfig @@ -117,7 +117,6 @@ 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 diff --git a/trunk/drivers/acpi/sleep/main.c b/trunk/drivers/acpi/sleep/main.c index 2cbb9aabd00e..caf8721ae6fb 100644 --- a/trunk/drivers/acpi/sleep/main.c +++ b/trunk/drivers/acpi/sleep/main.c @@ -256,6 +256,11 @@ static int acpi_hibernation_enter(void) static void acpi_hibernation_finish(void) { + /* + * If ACPI is not enabled by the BIOS and the boot kernel, we need to + * enable it here. + */ + acpi_enable(); acpi_leave_sleep_state(ACPI_STATE_S4); acpi_disable_wakeup_device(ACPI_STATE_S4); diff --git a/trunk/drivers/acpi/tables/tbutils.c b/trunk/drivers/acpi/tables/tbutils.c index 5f1d85f2ffe4..8cc9492ffbf2 100644 --- a/trunk/drivers/acpi/tables/tbutils.c +++ b/trunk/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 uninitialized_var(rsdt_address); + acpi_physical_address rsdt_address; u32 length; u8 *table_entry; acpi_status status; diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig index 7b580c3152de..73e248fb2ff1 100644 --- a/trunk/drivers/misc/Kconfig +++ b/trunk/drivers/misc/Kconfig @@ -134,7 +134,6 @@ 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. @@ -157,7 +156,6 @@ 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