diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:19:00 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:19:00 +0900 |
| commit | ff69497ad754b0fa9d5935df644890f208f31558 (patch) | |
| tree | 6a7b51f507093363f37eb817bdee3d28465c0f9d /arch/c6x/include/asm/Kbuild | |
| parent | 6c536a17fa049d0fb690c1a947b97dbfd304a916 (diff) | |
| parent | fbdd63d76c5ad6ae56a7bd1acebabefafc6aadf0 (diff) | |
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/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild index 4e4e98da819..112a496d835 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 |