diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:48:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:48:46 -0400 |
| commit | 59b17bf6ea06abed519dfc788fff1b6b9499d23f (patch) | |
| tree | 6f7e870659f91e753dc515cc1b8702420dd6a81e /drivers/acpi/Makefile | |
| parent | edd84690d15e4cb144cc60b754d4eaf8fac0a711 (diff) | |
| parent | 0f66af530116e9f4dd97f328d91718b56a6fc5a4 (diff) | |
| download | op-kernel-dev-59b17bf6ea06abed519dfc788fff1b6b9499d23f.zip op-kernel-dev-59b17bf6ea06abed519dfc788fff1b6b9499d23f.tar.gz | |
Merge branch 'async-battery' into release
Conflicts:
drivers/acpi/Makefile
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 4d4e3e0..03a985b 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -45,7 +45,6 @@ endif # 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_VIDEO) += video.o @@ -54,6 +53,7 @@ obj-$(CONFIG_ACPI_PROCESSOR) += processor.o obj-$(CONFIG_ACPI_CONTAINER) += container.o obj-$(CONFIG_ACPI_THERMAL) += thermal.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 |
