projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
um
/
include
/
asm
/
Kbuild
diff --git
a/arch/um/include/asm/Kbuild
b/arch/um/include/asm/Kbuild
index ea9ec2e34384011946741c4d5cf70480e8f55b89..3d63ff6f583ff406c98bce4014900669cec513bf 100644
(file)
--- a/
arch/um/include/asm/Kbuild
+++ b/
arch/um/include/asm/Kbuild
@@
-21,7
+21,6
@@
generic-y += param.h
generic-y += pci.h
generic-y += percpu.h
generic-y += preempt.h
-generic-y += scatterlist.h
generic-y += switch_to.h
generic-y += topology.h
generic-y += trace_clock.h