diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/m68k/mm/Makefile | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/m68k/mm/Makefile')
| -rw-r--r-- | arch/m68k/mm/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/mm/Makefile b/arch/m68k/mm/Makefile index 5eaa43c4cb3c..09cadf1058d5 100644 --- a/arch/m68k/mm/Makefile +++ b/arch/m68k/mm/Makefile | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | # Makefile for the linux m68k-specific parts of the memory manager. | 2 | # Makefile for the linux m68k-specific parts of the memory manager. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := cache.o init.o fault.o hwtest.o | 5 | obj-y := init.o |
| 6 | 6 | ||
| 7 | obj-$(CONFIG_MMU) += cache.o fault.o hwtest.o | ||
| 7 | obj-$(CONFIG_MMU_MOTOROLA) += kmap.o memory.o motorola.o | 8 | obj-$(CONFIG_MMU_MOTOROLA) += kmap.o memory.o motorola.o |
| 8 | obj-$(CONFIG_MMU_SUN3) += sun3kmap.o sun3mmu.o | 9 | obj-$(CONFIG_MMU_SUN3) += sun3kmap.o sun3mmu.o |