diff options
author | Dan Williams <dan.j.williams@intel.com> | 2010-05-18 01:30:58 +0200 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-18 01:30:58 +0200 |
commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
tree | fcf504879883763557e696eff81427b1ab78f76b /arch/mips/kernel/Makefile | |
parent | DMAENGINE: extend the control command to include an arg (diff) | |
parent | async_tx: trim dma_async_tx_descriptor in 'no channel switch' case (diff) | |
download | linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.xz linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.zip |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'arch/mips/kernel/Makefile')
-rw-r--r-- | arch/mips/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index ef20957ca14b..7a6ac501cbb5 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -6,7 +6,7 @@ extra-y := head.o init_task.o vmlinux.lds obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \ ptrace.o reset.o setup.o signal.o syscall.o \ - time.o topology.o traps.o unaligned.o watch.o + time.o topology.o traps.o unaligned.o watch.o vdso.o ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_ftrace.o = -pg |