aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-07-10 11:06:18 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-10 18:12:33 -0400
commit46f6976101c359202422753d15955f67aafabe2b (patch)
treef251e6132f3a5640086770f0b6f1d95344102e02 /drivers/acpi
parentaa0a9f373e3edb2c090f3fa0eb292712cfa97f81 (diff)
[PATCH] x86_64: Fix up bogus defaults in ACPI Kconfig
No need for video to be always in No need for smart battery driver to be always in Acked-by: Len Brown <len.brown@intel.com> Cc: linux-acpi@vger.kernel.org Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 290c767dd77f..89eacd1bfeeb 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -107,7 +107,6 @@ config ACPI_BUTTON
107config ACPI_VIDEO 107config ACPI_VIDEO
108 tristate "Video" 108 tristate "Video"
109 depends on X86 109 depends on X86
110 default y
111 help 110 help
112 This driver implement the ACPI Extensions For Display Adapters 111 This driver implement the ACPI Extensions For Display Adapters
113 for integrated graphics devices on motherboard, as specified in 112 for integrated graphics devices on motherboard, as specified in
@@ -350,7 +349,6 @@ config ACPI_SBS
350 tristate "Smart Battery System (EXPERIMENTAL)" 349 tristate "Smart Battery System (EXPERIMENTAL)"
351 depends on X86 && I2C 350 depends on X86 && I2C
352 depends on EXPERIMENTAL 351 depends on EXPERIMENTAL
353 default y
354 help 352 help
355 This driver adds support for the Smart Battery System. 353 This driver adds support for the Smart Battery System.
356 Depends on I2C (Device Drivers ---> I2C support) 354 Depends on I2C (Device Drivers ---> I2C support)