Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[mv-sheeva.git] / drivers / acpi / Makefile

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 13b611e7eade100b413d8fba9502a394ab22ed61..03a985be3fe3c6554c13b6549fa7b56aac474e49 100644 (file)
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -31,7 +31,6 @@ acpi-$(CONFIG_ACPI_SLEEP)     += proc.o
 #
 acpi-y                         += bus.o glue.o
 acpi-y                         += scan.o
-# Keep EC driver first. Initialization of others depend on it.
 acpi-y                         += ec.o
 acpi-$(CONFIG_ACPI_DOCK)       += dock.o
 acpi-y                         += pci_root.o pci_link.o pci_irq.o pci_bind.o
@@ -46,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
@@ -55,11 +53,11 @@ 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
 
-processor-objs += processor_core.o processor_throttling.o \
-                               processor_idle.o processor_thermal.o
-ifdef CONFIG_CPU_FREQ
-processor-objs += processor_perflib.o
-endif
+# 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