diff options
Diffstat (limited to 'arch/ia64/include/asm/Kbuild')
| -rw-r--r-- | arch/ia64/include/asm/Kbuild | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild index 05b03ecd7933..5cff31530efb 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild @@ -3,3 +3,8 @@ generic-y += clkdev.h generic-y += exec.h generic-y += kvm_para.h generic-y += trace_clock.h +<<<<<<< HEAD +======= +generic-y += preempt.h +generic-y += vtime.h +>>>>>>> a787870... sched, arch: Create asm/preempt.h |