diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-20 14:35:58 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-20 14:35:58 (GMT) |
| commit | 1b1c7409b75a8b62906b78b84c8469002072b738 (patch) | |
| tree | 91ceea4d8fae61b29e9a716c5e6ad56c3b5f588b /arch/arm/mm/Makefile | |
| parent | 573f8c8d13377ec03c2d23269f8eea50c11a7432 (diff) | |
| parent | b28748fb5d21d5d64c9ce31579ffbbd41f317042 (diff) | |
| download | linux-1b1c7409b75a8b62906b78b84c8469002072b738.tar.xz | |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/include/asm/memory.h
Diffstat (limited to 'arch/arm/mm/Makefile')
| -rw-r--r-- | arch/arm/mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 8a9c4cb..4e333fa 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -6,7 +6,7 @@ obj-y := dma-mapping.o extable.o fault.o init.o \ iomap.o obj-$(CONFIG_MMU) += fault-armv.o flush.o idmap.o ioremap.o \ - mmap.o pgd.o mmu.o vmregion.o + mmap.o pgd.o mmu.o ifneq ($(CONFIG_MMU),y) obj-y += nommu.o |