Merge branch 'acpi-modparam' into release

[linux-2.6-omap-h63xx.git] / drivers / acpi / Makefile

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 61675e21fba260e1f7e09be9adcfde801e403cf0..4d4e3e02fcb777d8b019bfec6f9aef6f143cfcbd 100644 (file)
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -14,44 +14,50 @@ obj-$(CONFIG_X86)           += blacklist.o
 #
 # ACPI Core Subsystem (Interpreter)
 #
-obj-y                          += osl.o utils.o reboot.o\
+obj-y                          += acpi.o \
                                        acpica/
 
+# All the builtin files are in the "acpi." module_param namespace.
+acpi-y                         += osl.o utils.o reboot.o
+
 # sleep related files
-obj-y                          += wakeup.o
-obj-y                          += sleep.o
-obj-$(CONFIG_ACPI_SLEEP)       += proc.o
+acpi-y                         += wakeup.o
+acpi-y                         += sleep.o
+acpi-$(CONFIG_ACPI_SLEEP)      += proc.o
 
 
 #
 # 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 scan.o ec.o \
-                                       power.o system.o event.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-$(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_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