diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-14 00:36:10 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-14 00:56:54 -0500 |
commit | f549ed1abc7e4f0292ce08c4143c64a610c8b2cb (patch) | |
tree | e168309c33d435e65f3c96a02d5c4ebf830e4a14 /arch/hexagon | |
parent | b0c29f79ecea0b6fbcefc999e70f2843ae8306db (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 <sfr@canb.auug.org.au>
Link: http://lkml.kernel.org/r/20140114164420.d296fbcc4be3a5f126c86069@canb.auug.org.au
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: David Miller <davem@davemloft.net>
Diffstat (limited to 'arch/hexagon')
-rw-r--r-- | arch/hexagon/include/asm/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index a614ec9747a6..ada843c701ef 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild | |||
@@ -2,6 +2,7 @@ | |||
2 | header-y += ucontext.h | 2 | header-y += ucontext.h |
3 | 3 | ||
4 | generic-y += auxvec.h | 4 | generic-y += auxvec.h |
5 | generic-y += barrier.h | ||
5 | generic-y += bug.h | 6 | generic-y += bug.h |
6 | generic-y += bugs.h | 7 | generic-y += bugs.h |
7 | generic-y += clkdev.h | 8 | generic-y += clkdev.h |
@@ -54,4 +55,3 @@ generic-y += ucontext.h | |||
54 | generic-y += unaligned.h | 55 | generic-y += unaligned.h |
55 | generic-y += xor.h | 56 | generic-y += xor.h |
56 | generic-y += preempt.h | 57 | generic-y += preempt.h |
57 | generic-y += barrier.h | ||