Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f549ed1a authored by Stephen Rothwell's avatar Stephen Rothwell Committed by H. Peter Anvin
Browse files

arch: Re-sort some Kbuild files to hopefully help avoid some conflicts 



Checkin:

    93ea02bb 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:

    e3fec2f7 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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Link: http://lkml.kernel.org/r/20140114164420.d296fbcc4be3a5f126c86069@canb.auug.org.au


Signed-off-by: default avatarH. 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>
parent b0c29f79

arch/arc/include/asm/Kbuild

+1 −1
Original line number Diff line number Diff line 
generic-y += auxvec.h

generic-y += barrier.h

generic-y += bugs.h

generic-y += bitsperlong.h

generic-y += clkdev.h
@@ -47,4 +48,3 @@ generic-y += user.h 
generic-y += vga.h

generic-y += xor.h

generic-y += preempt.h
 
generic-y += barrier.h

arch/cris/include/asm/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ header-y += arch-v10/ 
header-y += arch-v32/





generic-y += barrier.h

generic-y += clkdev.h

generic-y += exec.h

generic-y += kvm_para.h
@@ -12,4 +13,3 @@ generic-y += trace_clock.h 
generic-y += vga.h

generic-y += xor.h

generic-y += preempt.h
 
generic-y += barrier.h

arch/hexagon/include/asm/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
header-y += ucontext.h



generic-y += auxvec.h

generic-y += barrier.h

generic-y += bug.h

generic-y += bugs.h

generic-y += clkdev.h
@@ -54,4 +55,3 @@ generic-y += ucontext.h 
generic-y += unaligned.h

generic-y += xor.h

generic-y += preempt.h
 
generic-y += barrier.h

arch/microblaze/include/asm/Kbuild

+1 −1
Original line number Diff line number Diff line 


generic-y += barrier.h

generic-y += clkdev.h

generic-y += exec.h

generic-y += trace_clock.h

generic-y += syscalls.h

generic-y += preempt.h
 
generic-y += barrier.h

arch/mn10300/include/asm/Kbuild

+1 −1
Original line number Diff line number Diff line 


generic-y += barrier.h

generic-y += clkdev.h

generic-y += exec.h

generic-y += trace_clock.h

generic-y += preempt.h
 
generic-y += barrier.h