summaryrefslogtreecommitdiff
path: root/arch/c6x/include/asm/Kbuild
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-13 06:19:00 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-13 06:19:00 +0400
commitff69497ad754b0fa9d5935df644890f208f31558 (patch)
tree6a7b51f507093363f37eb817bdee3d28465c0f9d /arch/c6x/include/asm/Kbuild
parent6c536a17fa049d0fb690c1a947b97dbfd304a916 (diff)
parentfbdd63d76c5ad6ae56a7bd1acebabefafc6aadf0 (diff)
downloadlinux-ff69497ad754b0fa9d5935df644890f208f31558.tar.xz
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull C6X UAPI disintegration from Mark Salter: - scripted UAPI disintegration by David Howells. * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming: UAPI: (Scripted) Disintegrate arch/c6x/include/asm
Diffstat (limited to 'arch/c6x/include/asm/Kbuild')
-rw-r--r--arch/c6x/include/asm/Kbuild1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index 4e4e98da8192..112a496d8355 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -1,4 +1,3 @@
-include include/asm-generic/Kbuild.asm
generic-y += atomic.h
generic-y += auxvec.h