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

From: Stephen Rothwell
Date: Tue Jan 14 2014 - 00:37:45 EST


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/score/include/asm/Kbuild | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild
index 93e6ca919620..cf29d84fd9c2 100644
--- a/arch/arc/include/asm/Kbuild
+++ b/arch/arc/include/asm/Kbuild
@@ -11,6 +11,7 @@ generic-y +=3D fcntl.h
generic-y +=3D fb.h
generic-y +=3D ftrace.h
generic-y +=3D hardirq.h
+generic-y +=3D hash.h
generic-y +=3D hw_irq.h
generic-y +=3D ioctl.h
generic-y +=3D ioctls.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 hash.h
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index c5963b3e4624..406cbd3ebd58 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -5,6 +5,7 @@ header-y +=3D arch-v32/
=20
generic-y +=3D clkdev.h
generic-y +=3D exec.h
+generic-y +=3D hash.h
generic-y +=3D kvm_para.h
generic-y +=3D linkage.h
generic-y +=3D module.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 hash.h
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbu=
ild
index 469d223950ff..ae45d75a3187 100644
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@ -15,6 +15,7 @@ generic-y +=3D fb.h
generic-y +=3D fcntl.h
generic-y +=3D ftrace.h
generic-y +=3D hardirq.h
+generic-y +=3D hash.h
generic-y +=3D hw_irq.h
generic-y +=3D ioctl.h
generic-y +=3D ioctls.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 hash.h
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/a=
sm/Kbuild
index 43eec338ff50..ca60945ddf30 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -1,7 +1,7 @@
=20
generic-y +=3D clkdev.h
generic-y +=3D exec.h
+generic-y +=3D hash.h
generic-y +=3D trace_clock.h
generic-y +=3D syscalls.h
generic-y +=3D preempt.h
-generic-y +=3D hash.h
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbu=
ild
index bc42f14c9c2e..199345207d82 100644
--- a/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@ -1,6 +1,6 @@
=20
generic-y +=3D clkdev.h
generic-y +=3D exec.h
+generic-y +=3D hash.h
generic-y +=3D trace_clock.h
generic-y +=3D preempt.h
-generic-y +=3D hash.h
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index 099e7ba40599..1d35e33ccf86 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -2,8 +2,8 @@
header-y +=3D
=20
generic-y +=3D clkdev.h
+generic-y +=3D hash.h
generic-y +=3D trace_clock.h
generic-y +=3D xor.h
generic-y +=3D preempt.h
-generic-y +=3D hash.h
=20
--=20
1.8.5.2


--Multipart=_Tue__14_Jan_2014_16_44_20_+1100_7BleTZ=yvYU=Yypq
Content-Type: text/x-diff;
name="0001-tip-resort-some-Kbuild-files-to-hopefully-help-avoid.patch"
Content-Disposition: attachment;
filename="0001-tip-resort-some-Kbuild-files-to-hopefully-help-avoid.patch"
Content-Transfer-Encoding: quoted-printable