summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-10-10 00:27:26 -0400
committerLen Brown <len.brown@intel.com>2007-10-10 00:27:26 -0400
commit67e74fdd81349a92fcece318a5ee41714273eb01 (patch)
tree77119ca53fac01f1ce31687c5d7ff6ec6e8a2dc3 /drivers/acpi
parentbbf25010f1a6b761914430f5fca081ec8c7accd1 (diff)
parent8ab7367f483d1d676d61fca58498a73b194dda82 (diff)
downloadtalos-op-linux-67e74fdd81349a92fcece318a5ee41714273eb01.tar.gz
talos-op-linux-67e74fdd81349a92fcece318a5ee41714273eb01.zip
Pull randconfig into release branch
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/Kconfig1
-rw-r--r--drivers/acpi/tables/tbutils.c2
2 files changed, 2 insertions, 1 deletions
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
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;
OpenPOWER on IntegriCloud