4 files changed, 26 insertions, 33 deletions

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 61675e21fba2..4d4e3e02fcb7 100644
--- 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
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c
index 9cb189f3c77c..a8287be0870e 100644
--- a/drivers/acpi/debug.c
+++ b/drivers/acpi/debug.c
@@ -13,11 +13,6 @@
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("debug");
 
-#ifdef MODULE_PARAM_PREFIX
-#undef MODULE_PARAM_PREFIX
-#endif
-#define MODULE_PARAM_PREFIX "acpi."
-
 struct acpi_dlayer {
         const char *name;
         unsigned long value;
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 11968ba28feb..56665a63bf19 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -54,10 +54,6 @@ ACPI_MODULE_NAME("power");
 #define ACPI_POWER_RESOURCE_STATE_ON    0x01
 #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
 
-#ifdef MODULE_PARAM_PREFIX
-#undef MODULE_PARAM_PREFIX
-#endif
-#define MODULE_PARAM_PREFIX "acpi."
 int acpi_power_nocheck;
 module_param_named(power_nocheck, acpi_power_nocheck, bool, 000);
 
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 44be75ee7264..da51f05ef8d8 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -33,10 +33,6 @@
 
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("system");
-#ifdef MODULE_PARAM_PREFIX
-#undef MODULE_PARAM_PREFIX
-#endif
-#define MODULE_PARAM_PREFIX "acpi."
 
 #define ACPI_SYSTEM_CLASS               "system"
 #define ACPI_SYSTEM_DEVICE_NAME         "System"