diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:52:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:52:30 -0400 |
| commit | c493756e2a8a78bcaae30668317890dcfe86e7c3 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /arch/sparc/mm/Makefile | |
| parent | 0d15504f16f68725e4635aa85411015d1c573b0a (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'linus' into oprofile
Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h
Diffstat (limited to 'arch/sparc/mm/Makefile')
| -rw-r--r-- | arch/sparc/mm/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile index 109c8b22cb38..ea88955d97ff 100644 --- a/arch/sparc/mm/Makefile +++ b/arch/sparc/mm/Makefile | |||
| @@ -3,13 +3,8 @@ | |||
| 3 | 3 | ||
| 4 | EXTRA_AFLAGS := -ansi | 4 | EXTRA_AFLAGS := -ansi |
| 5 | 5 | ||
| 6 | obj-y := fault.o init.o loadmmu.o generic.o extable.o btfixup.o | 6 | obj-y := fault.o init.o loadmmu.o generic.o extable.o btfixup.o \ |
| 7 | 7 | srmmu.o iommu.o io-unit.o hypersparc.o viking.o tsunami.o swift.o | |
| 8 | ifeq ($(CONFIG_SUN4),y) | ||
| 9 | obj-y += nosrmmu.o | ||
| 10 | else | ||
| 11 | obj-y += srmmu.o iommu.o io-unit.o hypersparc.o viking.o tsunami.o swift.o | ||
| 12 | endif | ||
| 13 | 8 | ||
| 14 | ifdef CONFIG_HIGHMEM | 9 | ifdef CONFIG_HIGHMEM |
| 15 | obj-y += highmem.o | 10 | obj-y += highmem.o |