path: root/arch/score/include
diff options
authorStephen Rothwell <>2014-01-14 16:36:10 +1100
committerH. Peter Anvin <>2014-01-13 21:56:54 -0800
commitf549ed1abc7e4f0292ce08c4143c64a610c8b2cb (patch)
treee168309c33d435e65f3c96a02d5c4ebf830e4a14 /arch/score/include
parentb0c29f79ecea0b6fbcefc999e70f2843ae8306db (diff)
arch: Re-sort some Kbuild files to hopefully help avoid some conflicts
Checkin: 93ea02bb8435 arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h ... unfortunately left some Kbuild files out of order, which caused unnecessary merge conflicts, in particular with checkin: e3fec2f74f7f lib: Add missing arch generic-y entries for asm-generic/hash.h Put them back in order to make the upcoming merges cleaner. Signed-off-by: Stephen Rothwell <> Link: Signed-off-by: H. Peter Anvin <> Cc: Geert Uytterhoeven <> Cc: "Paul E. McKenney" <> Cc: Mathieu Desnoyers <> Cc: Peter Zijlstra <> Cc: David Miller <>
Diffstat (limited to 'arch/score/include')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index ee2993b6e5d1..fe7471eb0167 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -1,8 +1,8 @@
header-y +=
+generic-y += barrier.h
generic-y += clkdev.h
generic-y += trace_clock.h
generic-y += xor.h
generic-y += preempt.h
-generic-y += barrier.h