summaryrefslogtreecommitdiffstats
path: root/arch/score
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-26 00:22:36 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-26 00:22:36 +0200
commitad90fb97515b732bc27a0109baa10af636c3c8cd (patch)
tree9d49cfffb8c52b0bab9a443b39c6e7df7b7e03b7 /arch/score
parentMerge branch 'for-4.2/drivers' of git://git.kernel.dk/linux-block (diff)
parentremove scatterlist.h generation from arch Kbuild files (diff)
downloadlinux-ad90fb97515b732bc27a0109baa10af636c3c8cd.tar.xz
linux-ad90fb97515b732bc27a0109baa10af636c3c8cd.zip
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/score')
-rw-r--r--arch/score/include/asm/Kbuild1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index 83ed116d414c..138fb3db45ba 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -8,7 +8,6 @@ generic-y += cputime.h
generic-y += irq_work.h
generic-y += mcs_spinlock.h
generic-y += preempt.h
-generic-y += scatterlist.h
generic-y += sections.h
generic-y += trace_clock.h
generic-y += xor.h