From 0fd0dfda269d160aed0a2c145d36a4a0d3d5966f Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 17 Dec 2013 21:26:19 -0500 Subject: lib: Add missing arch generic-y entries for asm-generic/hash.h Conflicts: arch/avr32/include/asm/Kbuild arch/c6x/include/asm/Kbuild arch/cris/include/asm/Kbuild arch/ia64/include/asm/Kbuild arch/mips/include/asm/Kbuild arch/openrisc/include/asm/Kbuild arch/powerpc/include/asm/Kbuild arch/score/include/asm/Kbuild Change-Id: I6800e3f03dbc40e94de1495459dec4b29df4474e Reported-by: Stephen Rothwell Signed-off-by: David S. Miller (cherry picked from commit e3fec2f74f7f90d2149a24243a4d040caabe6f30) Signed-off-by: Ishan Mittal --- arch/score/include/asm/Kbuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/score') 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 -- cgit v1.2.3