summaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-25 15:22:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-25 15:22:36 -0700
commitad90fb97515b732bc27a0109baa10af636c3c8cd (patch)
tree9d49cfffb8c52b0bab9a443b39c6e7df7b7e03b7 /arch/sh
parent6a398a3ef404e661999cd4c58974cbceb52762e3 (diff)
parentc546d5db75b452737e554bb9c33dedb46847c4fd (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/sh')
-rw-r--r--arch/sh/include/asm/Kbuild1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild
index 654ebb6bd5d8..9ac4626e7284 100644
--- a/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@ -24,7 +24,6 @@ generic-y += percpu.h
generic-y += poll.h
generic-y += preempt.h
generic-y += resource.h
-generic-y += scatterlist.h
generic-y += sembuf.h
generic-y += serial.h
generic-y += shmbuf.h