diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 15:49:47 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 15:49:47 -0500 |
| commit | 31bbed527e7039203920c51c9fb48c27aed0820c (patch) | |
| tree | 71fa6e963f4c3d876e83e44927e87d5394a7cf69 /arch/x86/kernel/Makefile | |
| parent | 0fbba4871c42b297b0d6a6a6ff73e934cb91423e (diff) | |
| parent | b2b352590d94651579e6914ecdb08d30b2cb5f19 (diff) | |
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 95f216bbfaf1..339ce35648e6 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 | |||
| 111 | ### | 111 | ### |
| 112 | # 64 bit specific files | 112 | # 64 bit specific files |
| 113 | ifeq ($(CONFIG_X86_64),y) | 113 | ifeq ($(CONFIG_X86_64),y) |
| 114 | obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o | 114 | obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o |
| 115 | obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o | 115 | obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o |
| 116 | obj-$(CONFIG_AUDIT) += audit_64.o | 116 | obj-$(CONFIG_AUDIT) += audit_64.o |
| 117 | 117 | ||