diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 23:33:19 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 23:33:19 +0100 |
commit | 28cdac6690cb113856293bf79b40de33dbd8f974 (patch) | |
tree | 64cd8ca8376ccf9a12faee3588c15a5839f9a28b /arch/arm/mm/Makefile | |
parent | Merge branch 'misc' into devel (diff) | |
parent | ARM: pgtable: provide RDONLY page table bit rather than WRITE bit (diff) | |
download | linux-28cdac6690cb113856293bf79b40de33dbd8f974.tar.xz linux-28cdac6690cb113856293bf79b40de33dbd8f974.zip |
Merge branch 'pgt' (early part) into devel
Diffstat (limited to 'arch/arm/mm/Makefile')
-rw-r--r-- | arch/arm/mm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index d63b6c413758..00d74a04af3a 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -5,8 +5,8 @@ obj-y := dma-mapping.o extable.o fault.o init.o \ iomap.o -obj-$(CONFIG_MMU) += fault-armv.o flush.o ioremap.o mmap.o \ - pgd.o mmu.o vmregion.o +obj-$(CONFIG_MMU) += fault-armv.o flush.o idmap.o ioremap.o \ + mmap.o pgd.o mmu.o vmregion.o ifneq ($(CONFIG_MMU),y) obj-y += nommu.o |