diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-20 14:48:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-20 14:48:53 -0800 |
| commit | ec92b88c3c05dd9bc75379014858c504ebb9ecbc (patch) | |
| tree | 38b397e35e02a52e412835459216ec598706aa31 /arch/xtensa/include | |
| parent | e93b1cc8a8965da137ffea0b88e5f62fa1d2a9e6 (diff) | |
| parent | 30b507051dd1f79bbedce79cb37dc0ef31f5fb6c (diff) | |
| download | blackbird-obmc-linux-ec92b88c3c05dd9bc75379014858c504ebb9ecbc.tar.gz blackbird-obmc-linux-ec92b88c3c05dd9bc75379014858c504ebb9ecbc.zip | |
Merge tag 'xtensa-20161219' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa updates from Max Filippov:
- enable HAVE_DMA_CONTIGUOUS, configure shared DMA pool reservation in
kc705 DTS
- update xtensa DMA-related Documentation/features entries
- clean up arch/xtensa/kernel/setup.c: move S32C1I self-test out of it,
remove unused declarations, fix screen_info definition
* tag 'xtensa-20161219' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: update DMA-related Documentation/features entries
xtensa: configure shared DMA pool reservation in kc705 DTS
xtensa: enable HAVE_DMA_CONTIGUOUS
xtensa: move S32C1I self-test to a separate file
xtensa: fix screen_info, clean up unused declarations in setup.c
Diffstat (limited to 'arch/xtensa/include')
| -rw-r--r-- | arch/xtensa/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild index 28cf4c5d65ef..b7fbaa56b51a 100644 --- a/arch/xtensa/include/asm/Kbuild +++ b/arch/xtensa/include/asm/Kbuild @@ -3,6 +3,7 @@ generic-y += bug.h generic-y += clkdev.h generic-y += cputime.h generic-y += div64.h +generic-y += dma-contiguous.h generic-y += emergency-restart.h generic-y += errno.h generic-y += exec.h |
