Pull ec into release branch

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 92642ab15451..b6266e79af00 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for the Linux ACPI interpreter
-# 
+#
 
 export ACPI_CFLAGS
 
@@ -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