summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-01-14 16:36:10 +1100
committerH. Peter Anvin <hpa@linux.intel.com>2014-01-13 21:56:54 -0800
commitf549ed1abc7e4f0292ce08c4143c64a610c8b2cb (patch)
treee168309c33d435e65f3c96a02d5c4ebf830e4a14 /arch/cris
parentb0c29f79ecea0b6fbcefc999e70f2843ae8306db (diff)
downloadlinux-f549ed1abc7e4f0292ce08c4143c64a610c8b2cb.tar.gz
linux-f549ed1abc7e4f0292ce08c4143c64a610c8b2cb.tar.bz2
linux-f549ed1abc7e4f0292ce08c4143c64a610c8b2cb.zip
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/cris')
-rw-r--r--arch/cris/include/asm/Kbuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 35ec2e5ca832..199b1a9dab89 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -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