git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
s390
/
mm
/
Makefile
diff --git
a/arch/s390/mm/Makefile
b/arch/s390/mm/Makefile
index
eec0544
..
6fbc6f3
100644
(file)
--- a/
arch/s390/mm/Makefile
+++ b/
arch/s390/mm/Makefile
@@
-3,6
+3,6
@@
#
obj-y := init.o fault.o extmem.o mmap.o vmem.o pgtable.o maccess.o \
- page-states.o
+ page-states.o
gup.o
obj-$(CONFIG_CMM) += cmm.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o