diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 18:22:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 18:22:36 -0400 |
| commit | ad90fb97515b732bc27a0109baa10af636c3c8cd (patch) | |
| tree | 9d49cfffb8c52b0bab9a443b39c6e7df7b7e03b7 /arch/tile/include | |
| parent | 6a398a3ef404e661999cd4c58974cbceb52762e3 (diff) | |
| parent | c546d5db75b452737e554bb9c33dedb46847c4fd (diff) | |
Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block
Pull asm/scatterlist.h removal from Jens Axboe:
"We don't have any specific arch scatterlist anymore, since parisc
finally switched over. Kill the include"
* 'for-4.2/sg' of git://git.kernel.dk/linux-block:
remove scatterlist.h generation from arch Kbuild files
remove <asm/scatterlist.h>
Diffstat (limited to 'arch/tile/include')
| -rw-r--r-- | arch/tile/include/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index f5433e0e34e0..d53654488c2c 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild | |||
| @@ -27,7 +27,6 @@ generic-y += poll.h | |||
| 27 | generic-y += posix_types.h | 27 | generic-y += posix_types.h |
| 28 | generic-y += preempt.h | 28 | generic-y += preempt.h |
| 29 | generic-y += resource.h | 29 | generic-y += resource.h |
| 30 | generic-y += scatterlist.h | ||
| 31 | generic-y += sembuf.h | 30 | generic-y += sembuf.h |
| 32 | generic-y += serial.h | 31 | generic-y += serial.h |
| 33 | generic-y += shmbuf.h | 32 | generic-y += shmbuf.h |