Pull sbs into release branch

diff --combined drivers/acpi/Kconfig
index e905c950fd7b9e487f3eeea798c55f5b7ff3374b,d9d9721dcc915e54021ceba05d11d298530f60e7..139f41f033d8bae09144493eb77c1ac2b09d3d41
--- 1/drivers/acpi/Kconfig
--- 2/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@ -85,8 -85,8 +85,8 @@@ config ACPI_PROCF
        depends on ACPI
        default y
        ---help---
 -        Procfs interface for ACPI is made optional for back-compatible.
 -        As the same functions are duplicated in sysfs interface
 +        The Procfs interface for ACPI is made optional for backward compatibility.
 +        As the same functions are duplicated in the sysfs interface
          and this proc interface will be removed some time later,
          it's marked as deprecated.
          ( /proc/acpi/debug_layer && debug_level are deprecated by
@@@ -218,6 -218,43 +218,6 @@@ config ACPI_ASU
          NOTE: This driver is deprecated and will probably be removed soon,
          use asus-laptop instead.
  
 -config ACPI_IBM
 -      tristate "IBM ThinkPad Laptop Extras"
 -      depends on X86
 -      select BACKLIGHT_CLASS_DEVICE
 -      ---help---
 -        This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
 -        support for Fn-Fx key combinations, Bluetooth control, video
 -        output switching, ThinkLight control, UltraBay eject and more.
 -        For more information about this driver see <file:Documentation/ibm-acpi.txt>
 -        and <http://ibm-acpi.sf.net/> .
 -
 -        If you have an IBM ThinkPad laptop, say Y or M here.
 -
 -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.
 -        This support is obsoleted by CONFIG_HOTPLUG_PCI_ACPI.  It will
 -        allow locking and removing the laptop from the docking station,
 -        but will not properly connect PCI devices.
 -
 -        If you are not sure, say N here.
 -
 -config ACPI_IBM_BAY
 -      bool "Legacy Removable Bay Support"
 -      depends on ACPI_IBM
 -      default y
 -      ---help---
 -        Allows the ibm_acpi driver to handle removable bays.  It will allow
 -        disabling the device in the bay, and also generate notifications when
 -        the bay lever is ejected or inserted.
 -
 -        If you are not sure, say Y here.
 -
  config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86
@@@ -351,11 -388,10 +351,10 @@@ config ACPI_HOTPLUG_MEMOR
  
  config ACPI_SBS
        tristate "Smart Battery System (EXPERIMENTAL)"
-       depends on X86 && I2C
+       depends on X86
        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.
  

diff --combined drivers/acpi/Makefile
index b6266e79af00dab133c3143a076a30a5ca75f29b,55bbc404e5efeb9db90500d8b5ba5b3213bb0fda..d4336f1730e9a0324ff61cfed04bd7215e03a816
--- 1/drivers/acpi/Makefile
--- 2/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@@ -1,6 -1,6 +1,6 @@@
  #
  # Makefile for the Linux ACPI interpreter
 -# 
 +#
  
  export ACPI_CFLAGS
  
@@@ -32,17 -32,16 +32,17 @@@ obj-y                              += osl.o utils.o 
  processor-objs        += processor_core.o processor_throttling.o \
                                processor_idle.o processor_thermal.o
  ifdef CONFIG_CPU_FREQ
 -processor-objs        += processor_perflib.o                  
 +processor-objs        += processor_perflib.o
  endif
  
  obj-y                         += sleep/
  obj-y                         += bus.o glue.o
  obj-y                         += scan.o
 +# Keep EC driver first. Initialization of others depend on it.
 +obj-$(CONFIG_ACPI_EC)         += ec.o
  obj-$(CONFIG_ACPI_AC)                 += ac.o
  obj-$(CONFIG_ACPI_BATTERY)    += battery.o
  obj-$(CONFIG_ACPI_BUTTON)     += button.o
 -obj-$(CONFIG_ACPI_EC)         += ec.o
  obj-$(CONFIG_ACPI_FAN)                += fan.o
  obj-$(CONFIG_ACPI_DOCK)               += dock.o
  obj-$(CONFIG_ACPI_BAY)                += bay.o
@@@ -56,7 -55,8 +56,7 @@@ obj-$(CONFIG_ACPI_SYSTEM)     += system.o e
  obj-$(CONFIG_ACPI_DEBUG)      += debug.o
  obj-$(CONFIG_ACPI_NUMA)               += numa.o
  obj-$(CONFIG_ACPI_ASUS)               += asus_acpi.o
 -obj-$(CONFIG_ACPI_IBM)                += ibm_acpi.o
  obj-$(CONFIG_ACPI_TOSHIBA)    += toshiba_acpi.o
  obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)     += acpi_memhotplug.o
  obj-y                         += cm_sbs.o
- obj-$(CONFIG_ACPI_SBS)                += i2c_ec.o sbs.o
+ obj-$(CONFIG_ACPI_SBS)                += sbs.o