diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-01-23 17:38:04 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-01-23 17:38:04 +0400 |
| commit | bc9ae1d87086678defeeb3931c6f39ab8ed6e474 (patch) | |
| tree | a629491a897c076f7f1808e910aac57df33fc62b /arch/arm/mm/Makefile | |
| parent | 05621cf0b35aae2b05078a37b572632517459ea7 (diff) | |
| parent | 79668624e15d91a3b40143208cc884d8270942db (diff) | |
| download | linux-topics-bc9ae1d87086678defeeb3931c6f39ab8ed6e474.tar.gz | |
Merge branch 'tracking-samslt-all' into merge-linux-linaro
Diffstat (limited to 'arch/arm/mm/Makefile')
| -rw-r--r-- | arch/arm/mm/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 9d32a253aac..684a5fe84ea 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -17,6 +17,12 @@ obj-$(CONFIG_MODULES) += proc-syms.o obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o obj-$(CONFIG_HIGHMEM) += highmem.o +obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o +ifeq ($(CONFIG_ARM_LPAE),y) +obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage-3level.o +else +obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage-2level.o +endif obj-$(CONFIG_CPU_ABRT_NOMMU) += abort-nommu.o obj-$(CONFIG_CPU_ABRT_EV4) += abort-ev4.o @@ -97,3 +103,5 @@ obj-$(CONFIG_CACHE_FEROCEON_L2) += cache-feroceon-l2.o obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o obj-$(CONFIG_CACHE_XSC3L2) += cache-xsc3l2.o obj-$(CONFIG_CACHE_TAUROS2) += cache-tauros2.o + +obj-$(CONFIG_NUMA_ALLOC_NODES) += numa.o |