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/mn10300 | |
| 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/mn10300')
| -rw-r--r-- | arch/mn10300/include/asm/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild index 367ef399ddf7..032143ec2324 100644 --- a/arch/mn10300/include/asm/Kbuild +++ b/arch/mn10300/include/asm/Kbuild | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | 1 | ||
| 2 | generic-y += barrier.h | ||
| 2 | generic-y += clkdev.h | 3 | generic-y += clkdev.h |
| 3 | generic-y += exec.h | 4 | generic-y += exec.h |
| 4 | generic-y += trace_clock.h | 5 | generic-y += trace_clock.h |
| 5 | generic-y += preempt.h | 6 | generic-y += preempt.h |
| 6 | generic-y += barrier.h | ||