mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 03:11:46 +00:00
dc7c65db28
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (72 commits) Revert "x86/PCI: ACPI based PCI gap calculation" PCI: remove unnecessary volatile in PCIe hotplug struct controller x86/PCI: ACPI based PCI gap calculation PCI: include linux/pm_wakeup.h for device_set_wakeup_capable PCI PM: Fix pci_prepare_to_sleep x86/PCI: Fix PCI config space for domains > 0 Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n PCI: Simplify PCI device PM code PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep PCI ACPI: Rework PCI handling of wake-up ACPI: Introduce new device wakeup flag 'prepared' ACPI: Introduce acpi_device_sleep_wake function PCI: rework pci_set_power_state function to call platform first PCI: Introduce platform_pci_power_manageable function ACPI: Introduce acpi_bus_power_manageable function PCI: make pci_name use dev_name PCI: handle pci_name() being const PCI: add stub for pci_set_consistent_dma_mask() PCI: remove unused arch pcibios_update_resource() functions PCI: fix pci_setup_device()'s sprinting into a const buffer ... Fixed up conflicts in various files (arch/x86/kernel/setup_64.c, arch/x86/pci/irq.c, arch/x86/pci/pci.h, drivers/acpi/sleep/main.c, drivers/pci/pci.c, drivers/pci/pci.h, include/acpi/acpi_bus.h) from x86 and ACPI updates manually.
66 lines
1.7 KiB
Makefile
66 lines
1.7 KiB
Makefile
#
|
|
# 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)
|
|
|
|
#
|
|
# ACPI Boot-Time Table Parsing
|
|
#
|
|
obj-y += tables.o
|
|
obj-$(CONFIG_X86) += blacklist.o
|
|
|
|
#
|
|
# ACPI Core Subsystem (Interpreter)
|
|
#
|
|
obj-y += osl.o utils.o reboot.o\
|
|
dispatcher/ events/ executer/ hardware/ \
|
|
namespace/ parser/ resources/ tables/ \
|
|
utilities/
|
|
|
|
#
|
|
# 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
|
|
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-$(CONFIG_ACPI_EC) += ec.o
|
|
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_BAY) += bay.o
|
|
obj-$(CONFIG_ACPI_VIDEO) += video.o
|
|
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_POWER) += power.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-$(CONFIG_ACPI_DEBUG) += debug.o
|
|
obj-$(CONFIG_ACPI_NUMA) += numa.o
|
|
obj-$(CONFIG_ACPI_WMI) += wmi.o
|
|
obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o
|
|
obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.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
|