diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:49:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:49:47 +0100 |
| commit | 31bbed527e7039203920c51c9fb48c27aed0820c (patch) | |
| tree | 71fa6e963f4c3d876e83e44927e87d5394a7cf69 /arch/x86/kernel/Makefile | |
| parent | 0fbba4871c42b297b0d6a6a6ff73e934cb91423e (diff) | |
| parent | b2b352590d94651579e6914ecdb08d30b2cb5f19 (diff) | |
| download | op-kernel-dev-31bbed527e7039203920c51c9fb48c27aed0820c.zip op-kernel-dev-31bbed527e7039203920c51c9fb48c27aed0820c.tar.gz | |
Merge branch 'x86/uv' into x86/core
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 95f216b..339ce35 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -111,7 +111,7 @@ obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o # NB rename without _64 ### # 64 bit specific files ifeq ($(CONFIG_X86_64),y) - obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o + obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o obj-$(CONFIG_AUDIT) += audit_64.o |
