[PATCH] tip: resort some Kbuild files to hopefully help avoid someconflicts

[Stephen Rothwell]

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/arc/include/asm/Kbuild        | 2 +-
 arch/cris/include/asm/Kbuild       | 2 +-
 arch/hexagon/include/asm/Kbuild    | 2 +-
 arch/microblaze/include/asm/Kbuild | 2 +-
 arch/mn10300/include/asm/Kbuild    | 2 +-
 arch/parisc/include/asm/Kbuild     | 2 +-
 arch/score/include/asm/Kbuild      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild
index e07c786011af..9ae21c198007 100644
--- a/arch/arc/include/asm/Kbuild
+++ b/arch/arc/include/asm/Kbuild
@@ -1,4 +1,5 @@
 generic-y +=3D auxvec.h
+generic-y +=3D barrier.h
 generic-y +=3D bugs.h
 generic-y +=3D bitsperlong.h
 generic-y +=3D clkdev.h
@@ -47,4 +48,3 @@ generic-y +=3D user.h
 generic-y +=3D vga.h
 generic-y +=3D xor.h
 generic-y +=3D preempt.h
-generic-y +=3D barrier.h
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 +=3D arch-v10/
 header-y +=3D arch-v32/
=20
=20
+generic-y +=3D barrier.h
 generic-y +=3D clkdev.h
 generic-y +=3D exec.h
 generic-y +=3D kvm_para.h
@@ -12,4 +13,3 @@ generic-y +=3D trace_clock.h
 generic-y +=3D vga.h
 generic-y +=3D xor.h
 generic-y +=3D preempt.h
-generic-y +=3D barrier.h
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbu=
ild
index a614ec9747a6..ada843c701ef 100644
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@ -2,6 +2,7 @@
 header-y +=3D ucontext.h
=20
 generic-y +=3D auxvec.h
+generic-y +=3D barrier.h
 generic-y +=3D bug.h
 generic-y +=3D bugs.h
 generic-y +=3D clkdev.h
@@ -54,4 +55,3 @@ generic-y +=3D ucontext.h
 generic-y +=3D unaligned.h
 generic-y +=3D xor.h
 generic-y +=3D preempt.h
-generic-y +=3D barrier.h
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/a=
sm/Kbuild
index f77fb6630b11..a82426589fff 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -1,7 +1,7 @@
=20
+generic-y +=3D barrier.h
 generic-y +=3D clkdev.h
 generic-y +=3D exec.h
 generic-y +=3D trace_clock.h
 generic-y +=3D syscalls.h
 generic-y +=3D preempt.h
-generic-y +=3D barrier.h
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbu=
ild
index 367ef399ddf7..032143ec2324 100644
--- a/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@ -1,6 +1,6 @@
=20
+generic-y +=3D barrier.h
 generic-y +=3D clkdev.h
 generic-y +=3D exec.h
 generic-y +=3D trace_clock.h
 generic-y +=3D preempt.h
-generic-y +=3D barrier.h
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index 8df06d0074f4..34b0be4ca52d 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -1,8 +1,8 @@
=20
+generic-y +=3D barrier.h
 generic-y +=3D word-at-a-time.h auxvec.h user.h cputime.h emergency-restar=
t.h \
 	  segment.h topology.h vga.h device.h percpu.h hw_irq.h mutex.h \
 	  div64.h irq_regs.h kdebug.h kvm_para.h local64.h local.h param.h \
 	  poll.h xor.h clkdev.h exec.h
 generic-y +=3D trace_clock.h
 generic-y +=3D preempt.h
-generic-y +=3D barrier.h
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 @@
=20
 header-y +=3D
=20
+generic-y +=3D barrier.h
 generic-y +=3D clkdev.h
 generic-y +=3D trace_clock.h
 generic-y +=3D xor.h
 generic-y +=3D preempt.h
-generic-y +=3D barrier.h
--=20
1.8.5.2


--Multipart=_Tue__14_Jan_2014_16_44_20_+1100_7BleTZ=yvYU=Yypq--

--Signature=_Tue__14_Jan_2014_16_44_20_+1100_ZUiNbAZys/.R+jFz
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBCAAGBQJS1M64AAoJEMDTa8Ir7ZwVu4MP/iKvN+UL2uacqXmr+hVmrzkr
Poujf0syPdtSYorxWUqWRgf0jThok8q1Gf4SCY7TNL5bSxw4ISeQEQgnPZ0KKQlK
KyOdaShEd6g2gMv8n6M6Y6WHwHTFXcyjbBeAKsFF8kEaN+JnqFLJ8qrKGg5sup3A
QQrNgbQKVz4wk3QHH9gEBwd1YHPCdyLGEeI0eDnmyiFe3pYSEda8eGDVmgL8ncdz
1HypNrMaKmnvpzGFRacW+bqG88B4+ESpRYi3x5j340CcZBjVOu1uf/6hEZmdu1Js
4Z9gSBFOQavwn7A5U3+I0h2XM/4lf5GBuRkaP3BH5R9wu9iNY9NaSKz/STGVCK5n
tPzChzutsFnUNVDrKr/7SEfKWOyd3GPMMgvv8WqXiE2sKaadPLI/QjOSBQodwM40
MfpZ2amokMhB+nfjRQ/cYsAF/i9cblOE3hmUn4on/pZjnuerQSVQwFQpttY30bwj
OviixAHiM0nw9QSixXU+bRhsTwSBIdnIRfjsqODoZLF+88FTX7uxdYT3toKqp8FQ
yXeVBK1cyQ+6lDsvZVlfkLOopp8n6up+QS4LOopG/UydzUCi7uUD5pxNG+eJpDnA
aCYb56siHTCQPzgHn5RnJ8isk8TG5aQGEmk3Ula6WA/CXKwJ+TjrOvFpWbq3QwLs
vPCY10JQ/E2qos6XNPLB
=Y9EF
-----END PGP SIGNATURE-----

--Signature=_Tue__14_Jan_2014_16_44_20_+1100_ZUiNbAZys/.R+jFz--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/