projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux...
[deliverable/linux.git]
/
mm
/
Makefile
diff --git
a/mm/Makefile
b/mm/Makefile
index 9f117bab5322e59b49cba45146b0e54176d206ca..a5b0dd93427a7266d7a26dcc7fd1266c602725fb 100644
(file)
--- a/
mm/Makefile
+++ b/
mm/Makefile
@@
-32,5
+32,5
@@
obj-$(CONFIG_FS_XIP) += filemap_xip.o
obj-$(CONFIG_MIGRATION) += migrate.o
obj-$(CONFIG_SMP) += allocpercpu.o
obj-$(CONFIG_QUICKLIST) += quicklist.o
-obj-$(CONFIG_CGROUP_MEM_
CONT
) += memcontrol.o
+obj-$(CONFIG_CGROUP_MEM_
RES_CTLR
) += memcontrol.o
This page took
0.029955 seconds
and
5
git commands to generate.