summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-01-14 06:37:45 +0100
committerDavid S. Miller <davem@davemloft.net>2014-01-14 06:48:16 +0100
commit6806afc9aa1000db598e31164d2ef505be3b3075 (patch)
treed6078428ef0df2bcd471d38e35925b26b8324f67 /arch/cris
parentMerge branch 'qlcnic' (diff)
downloadlinux-6806afc9aa1000db598e31164d2ef505be3b3075.tar.xz
linux-6806afc9aa1000db598e31164d2ef505be3b3075.zip
net: resort some Kbuild files to hopefully help avoid some conflicts
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. 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 c5963b3e4624..406cbd3ebd58 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -5,6 +5,7 @@ header-y += arch-v32/
generic-y += clkdev.h
generic-y += exec.h
+generic-y += hash.h
generic-y += kvm_para.h
generic-y += linkage.h
generic-y += module.h
@@ -12,4 +13,3 @@ generic-y += trace_clock.h
generic-y += vga.h
generic-y += xor.h
generic-y += preempt.h
-generic-y += hash.h