parisc: convert cpu_check_affinity to new cpumask api

[safe/jmp/linux-2.6] / drivers / acpi / Makefile

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index a182434..b130ea0 100644 (file)
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -1,30 +1,27 @@
 #
 # Makefile for the Linux ACPI interpreter
-# 
-
-export ACPI_CFLAGS
-
-ACPI_CFLAGS    := -Os
-
-ifdef CONFIG_ACPI_DEBUG
-  ACPI_CFLAGS  += -DACPI_DEBUG_OUTPUT
-endif
+#
 
-EXTRA_CFLAGS   += $(ACPI_CFLAGS)
+ccflags-y                      := -Os
+ccflags-$(CONFIG_ACPI_DEBUG)   += -DACPI_DEBUG_OUTPUT
 
 #
 # ACPI Boot-Time Table Parsing
 #
 obj-y                          += tables.o
-obj-y                          += blacklist.o
+obj-$(CONFIG_X86)              += blacklist.o
 
 #
 # ACPI Core Subsystem (Interpreter)
 #
-obj-y                          += osl.o utils.o \
-                                  dispatcher/ events/ executer/ hardware/ \
-                                  namespace/ parser/ resources/ tables/ \
-                                  utilities/
+obj-y                          += osl.o utils.o reboot.o\
+                                       acpica/
+
+# sleep related files
+obj-y                          += wakeup.o
+obj-y                          += sleep.o
+obj-$(CONFIG_ACPI_SLEEP)       += proc.o
+
 
 #
 # ACPI Bus and Device Drivers
@@ -32,28 +29,33 @@ 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-y                          += 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_VIDEO)       += video.o 
-obj-$(CONFIG_ACPI_HOTKEY)      += hotkey.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_POWER)       += power.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_SYSTEM)      += system.o event.o
+obj-y                          += power.o
+obj-y                          += system.o event.o
 obj-$(CONFIG_ACPI_DEBUG)       += debug.o
 obj-$(CONFIG_ACPI_NUMA)                += numa.o
-obj-$(CONFIG_ACPI_ASUS)                += asus_acpi.o
-obj-$(CONFIG_ACPI_IBM)         += ibm_acpi.o
-obj-$(CONFIG_ACPI_TOSHIBA)     += toshiba_acpi.o
-obj-y                          += scan.o motherboard.o
 obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)      += acpi_memhotplug.o
+obj-$(CONFIG_ACPI_PROCFS_POWER)        += cm_sbs.o
+obj-$(CONFIG_ACPI_SBS)         += sbshc.o
+obj-$(CONFIG_ACPI_SBS)         += sbs.o