diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 00:51:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 00:51:06 +0100 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /drivers/pci/hotplug/Makefile | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
| download | op-kernel-dev-0811a433c61e85f895018239c4466a36311cd5de.zip op-kernel-dev-0811a433c61e85f895018239c4466a36311cd5de.tar.gz | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'drivers/pci/hotplug/Makefile')
| -rw-r--r-- | drivers/pci/hotplug/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile index 9bdbe1a..e31fb91 100644 --- a/drivers/pci/hotplug/Makefile +++ b/drivers/pci/hotplug/Makefile @@ -55,6 +55,9 @@ pciehp-objs := pciehp_core.o \ pciehp_ctrl.o \ pciehp_pci.o \ pciehp_hpc.o +ifdef CONFIG_ACPI +pciehp-objs += pciehp_acpi.o +endif shpchp-objs := shpchp_core.o \ shpchp_ctrl.o \ |
