Merge branch 'async-battery' into release
Len Brown [Sun, 5 Apr 2009 05:48:46 +0000 (01:48 -0400)]
Conflicts:
drivers/acpi/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>

1  2 
drivers/acpi/Makefile
drivers/acpi/battery.c

@@@ -29,35 -26,36 +29,35 @@@ acpi-$(CONFIG_ACPI_SLEEP)  += proc.
  #
  # ACPI Bus and Device Drivers
  #
 -processor-objs        += processor_core.o processor_throttling.o \
 -                              processor_idle.o processor_thermal.o
 -ifdef CONFIG_CPU_FREQ
 -processor-objs        += processor_perflib.o
 +acpi-y                                += bus.o glue.o
 +acpi-y                                += scan.o
 +acpi-y                                += ec.o
 +acpi-$(CONFIG_ACPI_DOCK)      += dock.o
 +acpi-y                                += pci_root.o pci_link.o pci_irq.o pci_bind.o
 +acpi-y                                += power.o
 +acpi-y                                += system.o event.o
 +acpi-$(CONFIG_ACPI_DEBUG)     += debug.o
 +acpi-$(CONFIG_ACPI_NUMA)      += numa.o
 +acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
 +ifdef CONFIG_ACPI_VIDEO
 +acpi-y                                += video_detect.o
  endif
  
 -obj-y                         += bus.o glue.o
 -obj-y                         += scan.o
 -# Keep EC driver first. Initialization of others depend on it.
 -obj-y                         += ec.o
 +# These are (potentially) separate modules
  obj-$(CONFIG_ACPI_AC)                 += ac.o
- obj-$(CONFIG_ACPI_BATTERY)    += battery.o
  obj-$(CONFIG_ACPI_BUTTON)     += button.o
  obj-$(CONFIG_ACPI_FAN)                += fan.o
 -obj-$(CONFIG_ACPI_DOCK)               += dock.o
  obj-$(CONFIG_ACPI_VIDEO)      += video.o
 -ifdef CONFIG_ACPI_VIDEO
 -obj-y                         += video_detect.o
 -endif
 -
 -obj-y                         += pci_root.o pci_link.o pci_irq.o pci_bind.o
  obj-$(CONFIG_ACPI_PCI_SLOT)   += pci_slot.o
  obj-$(CONFIG_ACPI_PROCESSOR)  += processor.o
  obj-$(CONFIG_ACPI_CONTAINER)  += container.o
  obj-$(CONFIG_ACPI_THERMAL)    += thermal.o
 -obj-y                         += power.o
 -obj-y                         += system.o event.o
 -obj-$(CONFIG_ACPI_DEBUG)      += debug.o
 -obj-$(CONFIG_ACPI_NUMA)               += numa.o
 -obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)     += acpi_memhotplug.o
 -obj-$(CONFIG_ACPI_PROCFS_POWER)       += cm_sbs.o
 +obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o
+ obj-$(CONFIG_ACPI_BATTERY)    += battery.o
  obj-$(CONFIG_ACPI_SBS)                += sbshc.o
  obj-$(CONFIG_ACPI_SBS)                += sbs.o
 +
 +# processor has its own "processor." module_param namespace
 +processor-y                   := processor_core.o processor_throttling.o
 +processor-y                   += processor_idle.o processor_thermal.o
 +processor-$(CONFIG_CPU_FREQ)  += processor_perflib.o
Simple merge