diff options
Diffstat (limited to 'arch/score')
| -rw-r--r-- | arch/score/include/asm/Kbuild | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 194574fdb482..09405b2dbd65 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -3,8 +3,6 @@ header-y += generic-y += clkdev.h generic-y += trace_clock.h -<<<<<<< HEAD -======= generic-y += xor.h generic-y += preempt.h ->>>>>>> a787870... sched, arch: Create asm/preempt.h +generic-y += hash.h |