diff options
| author | Mike Travis <travis@sgi.com> | 2008-12-31 20:34:16 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-03 12:53:31 -0500 |
| commit | 7eb19553369c46cc1fa64caf120cbcab1b597f7c (patch) | |
| tree | ef1a3beae706b9497c845d0a2557ceb4d2754998 /arch/sh/mm/Makefile_32 | |
| parent | 6092848a2a23b660150a38bc06f59d75838d70c8 (diff) | |
| parent | 8c384cdee3e04d6194a2c2b192b624754f990835 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask
Conflicts:
arch/x86/kernel/io_apic.c
kernel/rcuclassic.c
kernel/sched.c
kernel/time/tick-sched.c
Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/mm/Makefile_32')
| -rw-r--r-- | arch/sh/mm/Makefile_32 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/mm/Makefile_32 b/arch/sh/mm/Makefile_32 index f066e76da204..cb2f3f299591 100644 --- a/arch/sh/mm/Makefile_32 +++ b/arch/sh/mm/Makefile_32 | |||
| @@ -18,6 +18,7 @@ mmu-y := tlb-nommu.o pg-nommu.o | |||
| 18 | mmu-$(CONFIG_MMU) := fault_32.o tlbflush_32.o ioremap_32.o | 18 | mmu-$(CONFIG_MMU) := fault_32.o tlbflush_32.o ioremap_32.o |
| 19 | 19 | ||
| 20 | obj-y += $(mmu-y) | 20 | obj-y += $(mmu-y) |
| 21 | obj-$(CONFIG_DEBUG_FS) += asids-debugfs.o | ||
| 21 | 22 | ||
| 22 | ifdef CONFIG_DEBUG_FS | 23 | ifdef CONFIG_DEBUG_FS |
| 23 | obj-$(CONFIG_CPU_SH4) += cache-debugfs.o | 24 | obj-$(CONFIG_CPU_SH4) += cache-debugfs.o |