diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-03-28 22:38:48 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-05-24 10:03:50 +1000 |
| commit | f225c8675086b60d85264ef824568309163d79f8 (patch) | |
| tree | 188bef574892e4a6cd1af54a29c7fda758279efb | |
| parent | 1bccc43c1010f2ac88156c005fab6823569b0a39 (diff) | |
| download | linux-3.10-f225c8675086b60d85264ef824568309163d79f8.tar.gz linux-3.10-f225c8675086b60d85264ef824568309163d79f8.tar.bz2 linux-3.10-f225c8675086b60d85264ef824568309163d79f8.zip | |
m68k: merge the mmu and non-mmu mm/Makefile
Its is trivial to megre the mmu and non-mmu arch/m68k/mm/Makefile's back
into a single file. So do it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| -rw-r--r-- | arch/m68k/mm/Makefile | 14 | ||||
| -rw-r--r-- | arch/m68k/mm/Makefile_mm | 8 | ||||
| -rw-r--r-- | arch/m68k/mm/Makefile_no | 5 |
3 files changed, 9 insertions, 18 deletions
diff --git a/arch/m68k/mm/Makefile b/arch/m68k/mm/Makefile index b60270e4954..09cadf1058d 100644 --- a/arch/m68k/mm/Makefile +++ b/arch/m68k/mm/Makefile @@ -1,5 +1,9 @@ -ifdef CONFIG_MMU -include arch/m68k/mm/Makefile_mm -else -include arch/m68k/mm/Makefile_no -endif +# +# Makefile for the linux m68k-specific parts of the memory manager. +# + +obj-y := init.o + +obj-$(CONFIG_MMU) += cache.o fault.o hwtest.o +obj-$(CONFIG_MMU_MOTOROLA) += kmap.o memory.o motorola.o +obj-$(CONFIG_MMU_SUN3) += sun3kmap.o sun3mmu.o diff --git a/arch/m68k/mm/Makefile_mm b/arch/m68k/mm/Makefile_mm deleted file mode 100644 index 5eaa43c4cb3..00000000000 --- a/arch/m68k/mm/Makefile_mm +++ /dev/null @@ -1,8 +0,0 @@ -# -# Makefile for the linux m68k-specific parts of the memory manager. -# - -obj-y := cache.o init.o fault.o hwtest.o - -obj-$(CONFIG_MMU_MOTOROLA) += kmap.o memory.o motorola.o -obj-$(CONFIG_MMU_SUN3) += sun3kmap.o sun3mmu.o diff --git a/arch/m68k/mm/Makefile_no b/arch/m68k/mm/Makefile_no deleted file mode 100644 index 80579c6a688..00000000000 --- a/arch/m68k/mm/Makefile_no +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for the linux m68knommu specific parts of the memory manager. -# - -obj-y += init.o |