diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /drivers/pci/hotplug/Makefile | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pci/hotplug/Makefile')
| -rw-r--r-- | drivers/pci/hotplug/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile index 47ec8c80e16d..3e6532b945c1 100644 --- a/drivers/pci/hotplug/Makefile +++ b/drivers/pci/hotplug/Makefile | |||
| @@ -31,7 +31,7 @@ pci_hotplug-objs += cpci_hotplug_core.o \ | |||
| 31 | cpci_hotplug_pci.o | 31 | cpci_hotplug_pci.o |
| 32 | endif | 32 | endif |
| 33 | ifdef CONFIG_ACPI | 33 | ifdef CONFIG_ACPI |
| 34 | pci_hotplug-objs += acpi_pcihp.o | 34 | pci_hotplug-objs += acpi_pcihp.o |
| 35 | endif | 35 | endif |
| 36 | 36 | ||
| 37 | cpqphp-objs := cpqphp_core.o \ | 37 | cpqphp-objs := cpqphp_core.o \ |