diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-25 12:52:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-25 12:52:58 +0100 |
| commit | 0858f0fb2659fbbf2832922255a695b26613b781 (patch) | |
| tree | 852cc6675b833f42fe707c82a783a72593d104e7 /arch/arm64/mm/Makefile | |
| parent | be5e8e20e9eef55dbe6093094b0d49f2fd43915c (diff) | |
| parent | 108212d3384e981273049b8d007edcf612f1eda4 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'arch/arm64/mm/Makefile')
| -rw-r--r-- | arch/arm64/mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile index b51d36401d83..3ecb56c624d3 100644 --- a/arch/arm64/mm/Makefile +++ b/arch/arm64/mm/Makefile @@ -1,5 +1,5 @@ obj-y := dma-mapping.o extable.o fault.o init.o \ cache.o copypage.o flush.o \ ioremap.o mmap.o pgd.o mmu.o \ - context.o tlb.o proc.o + context.o proc.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o |