From: Len Brown Date: Sun, 5 Apr 2009 05:45:50 +0000 (-0400) Subject: Merge branch 'acpi-modparam' into release X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=edd84690d15e4cb144cc60b754d4eaf8fac0a711;p=linux-2.6-omap-h63xx.git Merge branch 'acpi-modparam' into release Conflicts: drivers/acpi/Makefile Signed-off-by: Len Brown --- edd84690d15e4cb144cc60b754d4eaf8fac0a711 diff --cc drivers/acpi/Makefile index 61675e21fba,1f5c7a5d55c..4d4e3e02fcb --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@@ -26,14 -29,22 +29,21 @@@ acpi-$(CONFIG_ACPI_SLEEP) += proc. # # 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 -# 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 + 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