ieee1394: merge from Linus

[powerpc.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 82289f1..56c5ba8 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -107,7 +107,6 @@ config ACPI_BUTTON
 config ACPI_VIDEO
        tristate "Video"
        depends on X86
-       default y
        help
          This driver implement the ACPI Extensions For Display Adapters
          for integrated graphics devices on motherboard, as specified in
@@ -357,7 +356,6 @@ config ACPI_SBS
        tristate "Smart Battery System (EXPERIMENTAL)"
        depends on X86 && I2C
        depends on EXPERIMENTAL
-       default y
        help
          This driver adds support for the Smart Battery System.
          Depends on I2C (Device Drivers ---> I2C support)