ieee1394: merge from Linus

Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 13 insertions, 3 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index bc2652d72fdc..56c5ba874623 100644
--- 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
@@ -135,8 +134,7 @@ config ACPI_FAN
 
 config ACPI_DOCK
         tristate "Dock"
-        depends on !ACPI_IBM_DOCK
-        default y
+        depends on EXPERIMENTAL
         help
           This driver adds support for ACPI controlled docking stations
 
@@ -214,6 +212,7 @@ config ACPI_IBM
 config ACPI_IBM_DOCK
         bool "Legacy Docking Station Support"
         depends on ACPI_IBM
+        depends on ACPI_DOCK=n
         default n
         ---help---
           Allows the ibm_acpi driver to handle docking station events.
@@ -352,6 +351,17 @@ config ACPI_HOTPLUG_MEMORY
           If one selects "m," this driver can be loaded using the following
           command: 
                 $>modprobe acpi_memhotplug 
+
+config ACPI_SBS
+        tristate "Smart Battery System (EXPERIMENTAL)"
+        depends on X86 && I2C
+        depends on EXPERIMENTAL
+        help
+          This driver adds support for the Smart Battery System.
+          Depends on I2C (Device Drivers ---> I2C support)
+          A "Smart Battery" is quite old and quite rare compared
+          to today's ACPI "Control Method" battery.
+
 endif   # ACPI
 
 endmenu