Commit 03feb052 authored by Len Brown's avatar Len Brown

Pull ec into release branch

parents fb165969 9fd9f8e8
# #
# Makefile for the Linux ACPI interpreter # Makefile for the Linux ACPI interpreter
# #
export ACPI_CFLAGS export ACPI_CFLAGS
...@@ -32,16 +32,17 @@ obj-y += osl.o utils.o \ ...@@ -32,16 +32,17 @@ obj-y += osl.o utils.o \
processor-objs += processor_core.o processor_throttling.o \ processor-objs += processor_core.o processor_throttling.o \
processor_idle.o processor_thermal.o processor_idle.o processor_thermal.o
ifdef CONFIG_CPU_FREQ ifdef CONFIG_CPU_FREQ
processor-objs += processor_perflib.o processor-objs += processor_perflib.o
endif endif
obj-y += sleep/ obj-y += sleep/
obj-y += bus.o glue.o obj-y += bus.o glue.o
obj-y += scan.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_AC) += ac.o
obj-$(CONFIG_ACPI_BATTERY) += battery.o obj-$(CONFIG_ACPI_BATTERY) += battery.o
obj-$(CONFIG_ACPI_BUTTON) += button.o obj-$(CONFIG_ACPI_BUTTON) += button.o
obj-$(CONFIG_ACPI_EC) += ec.o
obj-$(CONFIG_ACPI_FAN) += fan.o obj-$(CONFIG_ACPI_FAN) += fan.o
obj-$(CONFIG_ACPI_DOCK) += dock.o obj-$(CONFIG_ACPI_DOCK) += dock.o
obj-$(CONFIG_ACPI_BAY) += bay.o obj-$(CONFIG_ACPI_BAY) += bay.o
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment