diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:10:20 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:10:20 +0200 |
| commit | d0dac8082cbc2b234917ec53eb591b1ddbec80bb (patch) | |
| tree | 105651af2db033de4803b91cc029381a1b9b39d2 /arch/x86_64/kernel/Makefile | |
| parent | [IA64] Avoid .spillpsp directive in handcoded assembly (diff) | |
| parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/u... (diff) | |
| download | linux-d0dac8082cbc2b234917ec53eb591b1ddbec80bb.tar.xz linux-d0dac8082cbc2b234917ec53eb591b1ddbec80bb.zip | |
Merge with linus
Diffstat (limited to 'arch/x86_64/kernel/Makefile')
| -rw-r--r-- | arch/x86_64/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 0a3318e08ab6..5ca4a4598fda 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_GART_IOMMU) += pci-gart.o aperture.o obj-$(CONFIG_DUMMY_IOMMU) += pci-nommu.o pci-dma.o obj-$(CONFIG_SWIOTLB) += swiotlb.o obj-$(CONFIG_KPROBES) += kprobes.o +obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o obj-$(CONFIG_MODULES) += module.o |