diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-10 19:17:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-10 19:17:22 +0100 |
| commit | e84dcb80ef24eb9a2ac03506498e688fa7938718 (patch) | |
| tree | ebf5a366af8bbe1ed38440f040968806b16ce4fb /arch/arm/mm/Makefile | |
| parent | 8407e2ffb76d56c77b8eb8faa44b06b1b987ac3a (diff) | |
| parent | 71b9f09697fc2ebacbc9e52079f2c6156f9b994f (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'arch/arm/mm/Makefile')
| -rw-r--r-- | arch/arm/mm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 8045a48c8476..2d861a210ac5 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_MODULES) += proc-syms.o obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o obj-$(CONFIG_HIGHMEM) += highmem.o +obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_CPU_ABRT_NOMMU) += abort-nommu.o obj-$(CONFIG_CPU_ABRT_EV4) += abort-ev4.o |